summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2010-05-05 11:57:29 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2010-05-05 12:43:44 (GMT)
commitbfbf4d4ccdfb4cf35592c61674f6bffc28932787 (patch)
tree4d0c2e5c7c4e21178cba1cedf6ae45f47b5dcbf1
parent6bc32600d2367e78ddc39dd93694e01d4d75958d (diff)
downloadQt-bfbf4d4ccdfb4cf35592c61674f6bffc28932787.zip
Qt-bfbf4d4ccdfb4cf35592c61674f6bffc28932787.tar.gz
Qt-bfbf4d4ccdfb4cf35592c61674f6bffc28932787.tar.bz2
Fix build key on Windows with MinGW.
Also, rebuilt configure.exe Reviewed-by: Thiago Macieira
-rwxr-xr-xconfigure.exebin1318912 -> 1318912 bytes
-rw-r--r--tools/configure/configureapp.cpp2
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe
index 161fa1d..69e98dd 100755
--- a/configure.exe
+++ b/configure.exe
Binary files differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 79864f8..e264426 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2373,7 +2373,7 @@ void Configure::generateBuildKey()
+ buildSymbianKey + "\"\n"
"#else\n"
// Debug builds
- "# if (defined(_DEBUG) || defined(DEBUG))\n"
+ "# if (!QT_NO_DEBUG)\n"
"# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
+ build64Key.arg("debug") + "\"\n"
"# else\n"