diff options
| author | Mathias Hasselmann <mathias.hasselmann@kdab.com> | 2013-11-03 11:15:51 +0100 |
|---|---|---|
| committer | Mathias Hasselmann <mathias.hasselmann@kdab.com> | 2013-11-03 11:15:51 +0100 |
| commit | 43bcbea6d3807010a5041cc054de5a7ea3c2e146 (patch) | |
| tree | 0792913bc4f4f8aa0438dfb8d4ca8b6fbdda5fe2 | |
| parent | 6e887d4410690f248fc89801969afda40c4af66d (diff) | |
| download | qtquickstreamer-43bcbea6d3807010a5041cc054de5a7ea3c2e146.tar.gz qtquickstreamer-43bcbea6d3807010a5041cc054de5a7ea3c2e146.tar.xz | |
Rename metapads into itempads
| -rw-r--r-- | src/QuickStreamer/QuickStreamer.pro | 14 | ||||
| -rw-r--r-- | src/QuickStreamer/item.cpp | 2 | ||||
| -rw-r--r-- | src/QuickStreamer/itempads.h (renamed from src/QuickStreamer/metapads.h) | 5 | ||||
| -rw-r--r-- | src/Tools/Tools.pro | 2 | ||||
| -rw-r--r-- | src/Tools/makeitempads.cpp (renamed from src/Tools/makemetapads.cpp) | 3 | ||||
| -rw-r--r-- | src/Tools/makeitempads.pro (renamed from src/Tools/makemetapads.pro) | 3 |
6 files changed, 17 insertions, 12 deletions
diff --git a/src/QuickStreamer/QuickStreamer.pro b/src/QuickStreamer/QuickStreamer.pro index 68095f2..ac9415f 100644 --- a/src/QuickStreamer/QuickStreamer.pro +++ b/src/QuickStreamer/QuickStreamer.pro @@ -8,14 +8,14 @@ CONFIG += link_pkgconfig PKGCONFIG += gstreamer-1.0 SOURCES = \ - metapads.cpp \ + itempads.cpp \ plugin.cpp \ item.cpp HEADERS = \ - metapads.h \ plugin.h \ - item.h + item.h \ + itempads.h DEPLOY_FILES = \ qmldir @@ -24,9 +24,9 @@ OTHER_FILES = \ $$DEPLOY_FILES \ quickstreamerplugin.json -metapads.target = metapads.cpp -metapads.depends = $$OUT_PWD/../Tools/makemetapads -metapads.commands = $$OUT_PWD/../Tools/makemetapads 256 4096 > $$metapads.target || rm -f $$metapads.target -QMAKE_EXTRA_TARGETS += metapads +itempads.target = itempads.cpp +itempads.depends = $$OUT_PWD/../Tools/makeitempads +itempads.commands = $$OUT_PWD/../Tools/makeitempads 256 4096 > $$itempads.target || rm -f $$itempads.target +QMAKE_EXTRA_TARGETS += itempads for(FILE, DEPLOY_FILES):QMAKE_POST_LINK += $$quote($$QMAKE_COPY $$PWD/$$FILE $$FILE$$escape_expand(\n\t)) diff --git a/src/QuickStreamer/item.cpp b/src/QuickStreamer/item.cpp index f710f04..7539d07 100644 --- a/src/QuickStreamer/item.cpp +++ b/src/QuickStreamer/item.cpp @@ -1,5 +1,5 @@ #include "item.h" -#include "metapads.h" +#include "itempads.h" #include <gst/gst.h> diff --git a/src/QuickStreamer/metapads.h b/src/QuickStreamer/itempads.h index ee16485..744f037 100644 --- a/src/QuickStreamer/metapads.h +++ b/src/QuickStreamer/itempads.h @@ -1,3 +1,6 @@ +#ifndef QQUICKSTREAMER_ITEMPADS_H +#define QQUICKSTREAMER_ITEMPADS_H + #include "item.h" namespace QQuickStreamer { @@ -16,3 +19,5 @@ struct MetaTypePads } // namespace QQuickStreamer } // namespace Private + +#endif // QQUICKSTREAMER_ITEMPADS_H diff --git a/src/Tools/Tools.pro b/src/Tools/Tools.pro index b0fd86c..d41f4c6 100644 --- a/src/Tools/Tools.pro +++ b/src/Tools/Tools.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = \ - makemetapads.pro + makeitempads.pro diff --git a/src/Tools/makemetapads.cpp b/src/Tools/makeitempads.cpp index 16dfba6..5701ab3 100644 --- a/src/Tools/makemetapads.cpp +++ b/src/Tools/makeitempads.cpp @@ -30,8 +30,7 @@ int main(int argc, char **argv) QTextStream out(stdout); - out << "#include \"metapads.h\"" << endl - << "#include \"item.h\"" << endl + out << "#include \"itempads.h\"" << endl << "#include <gst/gst.h>" << endl << "#include <QVector>" << endl << endl diff --git a/src/Tools/makemetapads.pro b/src/Tools/makeitempads.pro index d359b6b..642ffe3 100644 --- a/src/Tools/makemetapads.pro +++ b/src/Tools/makeitempads.pro @@ -3,4 +3,5 @@ TEMPLATE = app CONFIG += console c++11 QT -= GUID -SOURCES = makemetapads.cpp +SOURCES = \ + makeitempads.cpp |