diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2013-10-31 16:23:18 +0100 |
---|---|---|
committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-11-01 13:57:48 +0100 |
commit | e42d338fde6a40b3672950530f3712cf6cb631a7 (patch) | |
tree | 2b1d60f797cee5de95ba5ee2ee685948fe009e20 | |
parent | 95231d6cf12d1e5b7f219fdf9f1cf502a5f7d52c (diff) | |
download | qtwebchannel-e42d338fde6a40b3672950530f3712cf6cb631a7.tar.gz |
Make it possible to build everything in one go
Disable installation of examples
Change-Id: I85092b0a22da871fdf02f197d0b85e7dc33243bc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
-rw-r--r-- | examples/examples.pro | 6 | ||||
-rw-r--r-- | examples/hybridshell/qtquick2applicationviewer/qtquick2applicationviewer.pri | 2 | ||||
-rw-r--r-- | examples/qtobject/qtquick2applicationviewer/qtquick2applicationviewer.pri | 2 | ||||
-rw-r--r-- | qwebchannel.pro | 10 |
4 files changed, 18 insertions, 2 deletions
diff --git a/examples/examples.pro b/examples/examples.pro new file mode 100644 index 0000000..9e579fa --- /dev/null +++ b/examples/examples.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS = \ + hybridshell \ + qtobject diff --git a/examples/hybridshell/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/hybridshell/qtquick2applicationviewer/qtquick2applicationviewer.pri index df939e4..f9a48b6 100644 --- a/examples/hybridshell/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/hybridshell/qtquick2applicationviewer/qtquick2applicationviewer.pri @@ -151,7 +151,7 @@ android { } export (ICON) -export (INSTALLS) +# export (INSTALLS) export (DEPLOYMENT) export (LIBS) export (QMAKE_EXTRA_TARGETS) diff --git a/examples/qtobject/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/qtobject/qtquick2applicationviewer/qtquick2applicationviewer.pri index df939e4..f9a48b6 100644 --- a/examples/qtobject/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/qtobject/qtquick2applicationviewer/qtquick2applicationviewer.pri @@ -151,7 +151,7 @@ android { } export (ICON) -export (INSTALLS) +# export (INSTALLS) export (DEPLOYMENT) export (LIBS) export (QMAKE_EXTRA_TARGETS) diff --git a/qwebchannel.pro b/qwebchannel.pro new file mode 100644 index 0000000..2401c44 --- /dev/null +++ b/qwebchannel.pro @@ -0,0 +1,10 @@ +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS = \ + 3rdparty \ + src \ + examples + +src.depends = 3rdparty +examples.depends = src
\ No newline at end of file |