diff options
author | Liang Qi <liang.qi@nokia.com> | 2010-04-19 13:26:55 (GMT) |
---|---|---|
committer | Liang Qi <liang.qi@nokia.com> | 2010-04-19 13:26:55 (GMT) |
commit | 1f0104850aafcb0e2d6af3fcd4d61ae7073c6e3d (patch) | |
tree | 12b71f9579d73bb3fa29d78bdc953406d883a4bd /tools/qtestlib | |
parent | 80f69e2d2501c9958068c305ccd909aa034334d9 (diff) | |
download | Qt-1f0104850aafcb0e2d6af3fcd4d61ae7073c6e3d.zip Qt-1f0104850aafcb0e2d6af3fcd4d61ae7073c6e3d.tar.gz Qt-1f0104850aafcb0e2d6af3fcd4d61ae7073c6e3d.tar.bz2 |
Fix the code for estimate whether the project is debug/release only in cetest.
Reviewed-by: Miikka Heikkinen
Reviewed-by: Joerg Bornemann
Diffstat (limited to 'tools/qtestlib')
-rw-r--r-- | tools/qtestlib/wince/cetest/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp index 9fe5f02..4272a83 100644 --- a/tools/qtestlib/wince/cetest/main.cpp +++ b/tools/qtestlib/wince/cetest/main.cpp @@ -285,10 +285,14 @@ int main(int argc, char **argv) } // Check wether the project is still in debug/release mode after reading // If .pro specifies to be one mode only, we need to accept this - if (project.isActiveConfig("debug")) + if (project.isActiveConfig("debug") && !project.isActiveConfig("release")) { TestConfiguration::testDebug = true; - else + debugOutput("ActiveConfig: debug only in .pro.", 1); + } + if (!project.isActiveConfig("debug") && project.isActiveConfig("release")) { TestConfiguration::testDebug = false; + debugOutput("ActiveConfig: release only in .pro.", 1); + } // determine what is the real mkspec to use if the default mkspec is being used if (Option::mkfile::qmakespec.endsWith("/default")) |