diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /tools/configure/configureapp.h | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'tools/configure/configureapp.h')
| -rw-r--r-- | tools/configure/configureapp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 58544b5041..65aa0cbed9 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -81,6 +81,8 @@ public: #if !defined(EVAL) bool copySpec(const char *name, const char *pfx, const QString &spec); void generateConfigfiles(); + void detectArch(); + void generateQConfigPri(); #endif void showSummary(); void findProjects( const QString& dirName ); |