diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-06-14 16:17:11 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 12:35:14 +0200 |
| commit | 693df71e0f1faea94f2b39658cfc3fb8bb5ee2a6 (patch) | |
| tree | e6167d7e7432587fb94d019b56fa5c7d27bacf14 /tools/configure/configureapp.h | |
| parent | bbb15b4612946851d7d81940a9cd6e3a3753c3f2 (diff) | |
Fix configure.exe to build qmake before tests
qmake is needed by autoDetection()/tryCompileProject() to be able to build the
tests. This patch also add a new method - generateQConfigCpp() - which
generates qconfig.cpp, needed to build qmake.
Change-Id: Ic304a364a13a2b3c28433f2a299df222a56fed67
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/configure/configureapp.h')
| -rw-r--r-- | tools/configure/configureapp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index c16b9e2ad3..ff5050ad8d 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -64,6 +64,8 @@ public: QString defaultTo(const QString &option); bool checkAvailability(const QString &part); + void generateQConfigCpp(); + void buildQmake(); void autoDetection(); bool verifyConfiguration(); @@ -73,7 +75,6 @@ public: void generateBuildKey(); void generateCachefile(); void displayConfig(); - void buildQmake(); #endif void generateMakefiles(); void appendMakeItem(int inList, const QString &item); |