summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-06 13:51:46 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-06 13:51:46 (GMT)
commit8873580b3474f5e0fc7a48ba7b4c7d65c0acce26 (patch)
tree5a0fd227772acf82ca55ccf63a5399ff2da321c0
parente517ecc9025b68179c67a383791eefbedfee0543 (diff)
parentab56759cefbcf2072ac777f0d897e561f5a3c8af (diff)
downloadQt-8873580b3474f5e0fc7a48ba7b4c7d65c0acce26.zip
Qt-8873580b3474f5e0fc7a48ba7b4c7d65c0acce26.tar.gz
Qt-8873580b3474f5e0fc7a48ba7b4c7d65c0acce26.tar.bz2
Merge commit 'ab56759cefbcf2072ac777f0d897e561f5a3c8af' into 4.5
-rw-r--r--tools/checksdk/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/checksdk/main.cpp b/tools/checksdk/main.cpp
index 1d4b616..717f5c9 100644
--- a/tools/checksdk/main.cpp
+++ b/tools/checksdk/main.cpp
@@ -97,12 +97,6 @@ int main(int argc, char **argv)
}
}
- // Check for SDK Name, otherwise use Windows Mobile as default
- if (sdkName.isEmpty()) {
- qWarning("No SDK specified: Defaulting to Windows Mobile 5.0 Pocket PC SDK");
- sdkName = QString::fromLatin1("Windows Mobile 5.0 Pocket PC SDK (ARMV4I)");
- }
-
CeSdkHandler handler;
if (!handler.parse()) {
qWarning("Could not find any installed SDK, aborting!");
@@ -118,6 +112,12 @@ int main(int argc, char **argv)
return 0;
}
+ // Check for SDK Name, otherwise use Windows Mobile as default
+ if (sdkName.isEmpty()) {
+ qWarning("No SDK specified: Defaulting to Windows Mobile 5.0 Pocket PC SDK");
+ sdkName = QString::fromLatin1("Windows Mobile 5.0 Pocket PC SDK (ARMV4I)");
+ }
+
// finally find the given SDK and prompt out the environment to be set
for (QList<CeSdkInfo>::iterator it = list.begin(); it != list.end(); ++it ) {
if (sdkName == it->name()) {