diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-03 23:00:16 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-03 23:00:16 (GMT) |
| commit | a6733f5e70c6a4f3695dc380d1960d59f60e38b9 (patch) | |
| tree | 6da80ff96b48224bf33580a9189bf25a638be77e /tools/configure/configureapp.h | |
| parent | c343e2139b1764008b812ee6cc3a2a980fa4d147 (diff) | |
| parent | 14e4fd08ff67578dccf5e85a88fcadf747ae5852 (diff) | |
| download | Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.zip Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.tar.gz Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tools/configure/configureapp.h')
| -rw-r--r-- | tools/configure/configureapp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index b3c07f7..32d1860 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -122,8 +122,6 @@ private: QStringList qmakeStyles; QStringList qmakeStylePlugins; - QStringList qmakeFormatPlugins; - QStringList qmakeVars; QStringList qmakeDefines; // makeList[0] for qt and qtmain |