From e42d338fde6a40b3672950530f3712cf6cb631a7 Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Thu, 31 Oct 2013 16:23:18 +0100 Subject: Make it possible to build everything in one go Disable installation of examples Change-Id: I85092b0a22da871fdf02f197d0b85e7dc33243bc Reviewed-by: Pierre Rossi --- examples/examples.pro | 6 ++++++ .../qtquick2applicationviewer/qtquick2applicationviewer.pri | 2 +- .../qtquick2applicationviewer/qtquick2applicationviewer.pri | 2 +- qwebchannel.pro | 10 ++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 examples/examples.pro create mode 100644 qwebchannel.pro 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 -- cgit v1.2.1