summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.h
diff options
context:
space:
mode:
authorBjoern Breitmeyer <bjoern.breitmeyer@kdab.com>2013-08-09 14:10:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-15 18:02:42 +0200
commit32d4be85980a3d8c747b428640d0a3d8e36d94d5 (patch)
tree94a38a822a27466ac625e65300ab24cae610428e /tools/configure/configureapp.h
parenta6eb28d3f68bec2d4b049da3d0b62808c6525895 (diff)
Integrate device-option into the windows configure
Windows configure does not have -device-option yet. A hack for android already generated the qdevice.pri. But it did this even if no android was build, so merged the device-option with the android generation of qdevice.pri. The qdevice.pri is generated earlier in the configure steps than before to match the linux configure and allow to set device options before the config.tests are run. Change-Id: I753cf0d5eba1479792a685d6e1f5acb38b970893 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure/configureapp.h')
-rw-r--r--tools/configure/configureapp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 314b2be861..8a22cea6ec 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -77,6 +77,7 @@ public:
void generateConfigfiles();
void detectArch();
void generateQConfigPri();
+ void generateQDevicePri();
void prepareConfigTests();
void showSummary();
QString firstLicensePath();