diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:45:12 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:45:12 +0200 |
| commit | 6213b8145772d3dc584907a544f6c46b8cef74e2 (patch) | |
| tree | 4c1902793bb78511e63c09cbe92f9eda6b3d7237 /tools/configure/configureapp.h | |
| parent | 75e9c7d6bc662e62e9ce8b641588183992c1e8bf (diff) | |
| parent | 25739bebba0343a8b35775a073c49f0fba080762 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
tools/configure/configureapp.cpp
Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
Diffstat (limited to 'tools/configure/configureapp.h')
| -rw-r--r-- | tools/configure/configureapp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 3014e409f9..8f95e1fb95 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -104,6 +104,7 @@ private: // Our variable dictionaries QMap<QString,QString> dictionary; + QStringList allBuildParts; QStringList defaultBuildParts; QStringList buildParts; QStringList nobuildParts; |