summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-10-16 09:56:09 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-10-16 10:39:01 (GMT)
commit2e1811d128c29b4e9fb01790d5a1f7a01b8f395c (patch)
tree14280c1e1810a21ea619b4159e5b045ff8a898e1 /tools
parent93c7ab5a2b10481e4f10a6477379d8157ae5f7b0 (diff)
downloadQt-2e1811d128c29b4e9fb01790d5a1f7a01b8f395c.zip
Qt-2e1811d128c29b4e9fb01790d5a1f7a01b8f395c.tar.gz
Qt-2e1811d128c29b4e9fb01790d5a1f7a01b8f395c.tar.bz2
Fixed `-debug' option to cetest deploying release DLLs.
cetest was processing .pro files without build_pass set. That's wrong, as it means the qmake logic is set up for generating the debug-and-release glue project instead of the real project. Until commit 75b41faff44a1488d88eca6e910d4b617cb42221, it didn't matter. After that commit, cetest would always try to deploy release versions of Qt DLLs even when run with `-debug'. Reviewed-by: joerg
Diffstat (limited to 'tools')
-rw-r--r--tools/qtestlib/wince/cetest/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp
index 9df70e7..e00c0e7 100644
--- a/tools/qtestlib/wince/cetest/main.cpp
+++ b/tools/qtestlib/wince/cetest/main.cpp
@@ -237,6 +237,8 @@ int main(int argc, char **argv)
debugOutput(QString::fromLatin1("Using Project File:").append(proFile),1);
}
+ Option::before_user_vars.append("CONFIG+=build_pass");
+
// read target and deployment rules
int qmakeArgc = 1;
char* qmakeArgv[] = { "qmake.exe" };