diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-29 11:22:49 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-29 11:24:21 (GMT) |
| commit | d38ebd566f3a73f280903929d4ac49d255be3aed (patch) | |
| tree | e53d02cee6b31efab9de08e627e4fc167e48f205 /tools | |
| parent | f736d889bca3ce5d33b1e5499ad8714952c67906 (diff) | |
| download | Qt-d38ebd566f3a73f280903929d4ac49d255be3aed.zip Qt-d38ebd566f3a73f280903929d4ac49d255be3aed.tar.gz Qt-d38ebd566f3a73f280903929d4ac49d255be3aed.tar.bz2 | |
Removed mentions about certain flags being temporary for Symbian
In configure app, some QT_NO_* flags were indicated to be temporary
and should be removed once Qt for Symbian is out,
but it looks like at least some of them will be there for longer haul,
so removed mentions of temporary nature of these flags.
Task-number: QTBUG-4744
Reviewed-by: Janne Anttila
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index adf7a1a..25a02f3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2780,17 +2780,6 @@ QString Configure::addDefine(QString def) } #if !defined(EVAL) -// ### This should be removed once Qt for S60 is out. -static void applyTemporarySymbianFlags(QStringList &qconfigList) -{ - qconfigList += "QT_NO_CONCURRENT"; - qconfigList += "QT_NO_QFUTURE"; - // This is removed because it uses UNIX signals which are not implemented yet - qconfigList += "QT_NO_CRASHHANDLER"; - qconfigList += "QT_NO_PRINTER"; - qconfigList += "QT_NO_SYSTEMTRAYICON"; -} - void Configure::generateConfigfiles() { QDir(buildPath).mkpath("src/corelib/global"); @@ -2913,9 +2902,14 @@ void Configure::generateConfigfiles() if (dictionary["GRAPHICS_SYSTEM"] == "openvg") qconfigList += "QT_GRAPHICSSYSTEM_OPENVG"; if (dictionary["GRAPHICS_SYSTEM"] == "opengl") qconfigList += "QT_GRAPHICSSYSTEM_OPENGL"; if (dictionary["GRAPHICS_SYSTEM"] == "raster") qconfigList += "QT_GRAPHICSSYSTEM_RASTER"; - // ### This block should be removed once Qt for S60 is out. + if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) { - applyTemporarySymbianFlags(qconfigList); + // These features are not ported to Symbian (yet) + qconfigList += "QT_NO_CONCURRENT"; + qconfigList += "QT_NO_QFUTURE"; + qconfigList += "QT_NO_CRASHHANDLER"; + qconfigList += "QT_NO_PRINTER"; + qconfigList += "QT_NO_SYSTEMTRAYICON"; } qconfigList.sort(); |