From 32d4be85980a3d8c747b428640d0a3d8e36d94d5 Mon Sep 17 00:00:00 2001 From: Bjoern Breitmeyer Date: Fri, 9 Aug 2013 14:10:15 +0200 Subject: 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 --- tools/configure/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/configure/main.cpp') 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()) -- cgit v1.2.3