summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-16 11:52:44 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-16 12:08:50 (GMT)
commitc21f29ffdee20495ec93ab8937c51c825703c319 (patch)
tree13dea10b63b50460f86d94afa7009150f3636231 /tools/configure
parent916d59cec5247f8df9a3a5e0e329d973dc4380c0 (diff)
downloadQt-c21f29ffdee20495ec93ab8937c51c825703c319.zip
Qt-c21f29ffdee20495ec93ab8937c51c825703c319.tar.gz
Qt-c21f29ffdee20495ec93ab8937c51c825703c319.tar.bz2
Fix QT_BUILD_KEY for Symbian.
Symbian builds didn't set build key properly, so it defaulted to a Windows key. This caused problems with loading plugins. Task-number: QTBUG-7942 Reviewed-by: axis
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp27
1 files changed, 17 insertions, 10 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 83b4d9c..9e0cb70 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2265,24 +2265,31 @@ void Configure::generateBuildKey()
QString build32Key = buildKey + "Windows " + compiler + " %1 " + build_options.join(" ") + " " + build_defines.join(" ");
QString build64Key = buildKey + "Windows x64 " + compiler + " %1 " + build_options.join(" ") + " " + build_defines.join(" ");
+ QString buildSymbianKey = buildKey + "Symbian " + build_options.join(" ") + " " + build_defines.join(" ");
build32Key = build32Key.simplified();
build64Key = build64Key.simplified();
- build32Key.prepend("# define ");
- build64Key.prepend("# define ");
+ buildSymbianKey = buildSymbianKey.simplified();
+ build32Key.prepend("# define ");
+ build64Key.prepend("# define ");
+ buildSymbianKey.prepend("# define ");
- QString buildkey = // Debug builds
- "#if (defined(_DEBUG) || defined(DEBUG))\n"
- "# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
+ QString buildkey = "#if defined(__SYMBIAN32__)\n"
+ + buildSymbianKey + "\"\n"
+ "#else\n"
+ // Debug builds
+ "# if (defined(_DEBUG) || defined(DEBUG))\n"
+ "# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
+ build64Key.arg("debug") + "\"\n"
- "# else\n"
+ "# else\n"
+ build32Key.arg("debug") + "\"\n"
- "# endif\n"
- "#else\n"
+ "# endif\n"
+ "# else\n"
// Release builds
- "# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
+ "# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
+ build64Key.arg("release") + "\"\n"
- "# else\n"
+ "# else\n"
+ build32Key.arg("release") + "\"\n"
+ "# endif\n"
"# endif\n"
"#endif\n";