diff options
| author | Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com> | 2013-08-09 14:10:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-15 18:02:42 +0200 |
| commit | 32d4be85980a3d8c747b428640d0a3d8e36d94d5 (patch) | |
| tree | 94a38a822a27466ac625e65300ab24cae610428e /tools/configure/main.cpp | |
| parent | a6eb28d3f68bec2d4b049da3d0b62808c6525895 (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/main.cpp')
| -rw-r--r-- | tools/configure/main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index 9beee36a50..fb815b287e 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -81,6 +81,11 @@ int runConfigure( int argc, char** argv ) if (!app.isOk()) return 3; + // Generate qdevice.pri + app.generateQDevicePri(); + if (!app.isOk()) + return 3; + // Prepare the config test build directory. app.prepareConfigTests(); if (!app.isOk()) |