summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-09-28 09:57:04 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-28 11:43:47 +0200
commit85569dfdff1caec2efb714a1a9cdc64094893ec1 (patch)
treea8eff782686b348c8ed0a97730e16156133e80ea /tools
parent9a8466839b030a4ffebf74a813737d7cc55aa1d0 (diff)
Build with qt-in-namespace
Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a Reviewed-on: http://codereview.qt-project.org/5693 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlmin/main.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/qmlmin/main.cpp b/tools/qmlmin/main.cpp
index 7a5b8f9457..753479a6e5 100644
--- a/tools/qmlmin/main.cpp
+++ b/tools/qmlmin/main.cpp
@@ -50,6 +50,8 @@
#include <iostream>
#include <cstdlib>
+QT_BEGIN_NAMESPACE
+
//
// QML/JS minifier
//
@@ -483,7 +485,7 @@ static void usage(bool showHelp = false)
}
}
-int main(int argc, char *argv[])
+int runQmlmin(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
@@ -589,3 +591,10 @@ int main(int argc, char *argv[])
return 0;
}
+
+QT_END_NAMESPACE
+
+int main(int argc, char **argv)
+{
+ return QT_PREPEND_NAMESPACE(runQmlmin(argc, argv));
+}