summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-08-25 11:47:24 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-08-25 12:52:15 +0200
commit8e6ecb56e5d61ce661422779c9d9cbf22f081a34 (patch)
tree227aeb360800a49de58472bd39bc5f4c596c1b15 /tools
parentc9224b6cf5cceb7d5314f7504d44bfe72bc66950 (diff)
parent0d84e957297b4ffa6ab5b0b5bcf8b169d567d298 (diff)
Merge branch 'master' into refactor
Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlscene/main.cpp6
-rw-r--r--tools/qmlscene/qmlscene.pro4
-rw-r--r--tools/qmltestrunner/qmltestrunner.pro6
-rw-r--r--tools/qmlviewer/main.cpp3
-rw-r--r--tools/qmlviewer/qmlviewer.pro6
5 files changed, 11 insertions, 14 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 95b1059943..0139f591a6 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -56,7 +56,6 @@
#include <QtWidgets/QGraphicsView>
#include <QtDeclarative/qdeclarativecontext.h>
-#include <private/qdeclarativedebughelper_p.h>
// ### This should be private API
#include <qsgitem.h>
@@ -321,8 +320,8 @@ static void checkAndAdaptVersion(const QUrl &url)
return;
}
- QRegExp quick1("import +QtQuick +1\\.");
- QRegExp qt47("import +Qt +4\\.7");
+ QRegExp quick1("^\\s*import +QtQuick +1\\.");
+ QRegExp qt47("^\\s*import +Qt +4\\.7");
QString envToWrite;
QString compat;
@@ -418,7 +417,6 @@ int main(int argc, char ** argv)
Options options;
- QDeclarativeDebugHelper::enableDebugging();
QStringList imports;
for (int i = 1; i < argc; ++i) {
if (*argv[i] != '-' && QFileInfo(argv[i]).exists())
diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro
index 8e252e589f..0e8ca9b6c9 100644
--- a/tools/qmlscene/qmlscene.pro
+++ b/tools/qmlscene/qmlscene.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = qmlscene
-DESTDIR= ../../bin
+DESTDIR= $$QT.declarative.bins
QT += declarative declarative-private qtquick1
@@ -11,7 +11,7 @@ macx: CONFIG -= app_bundle
SOURCES += main.cpp
-CONFIG += console
+CONFIG += console declarative_debug
symbian {
TARGET.EPOCHEAPSIZE = 0x20000 0x5000000
diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
index c431aafcb5..e0dd3d5b5a 100644
--- a/tools/qmltestrunner/qmltestrunner.pro
+++ b/tools/qmltestrunner/qmltestrunner.pro
@@ -6,7 +6,9 @@ SOURCES += main.cpp
QT += declarative qmltest
-DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$OUT_PWD\\\"\"
+macx: CONFIG -= app_bundle
+
+#DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$OUT_PWD\\\"\"
target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
+INSTALLS += target \ No newline at end of file
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index bf99fa5630..cf33c4e365 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -52,7 +52,6 @@
#include <QAtomicInt>
#include <QLibraryInfo>
#include "qdeclarativetester.h"
-#include <private/qdeclarativedebughelper_p.h>
QT_USE_NAMESPACE
@@ -539,8 +538,6 @@ int main(int argc, char ** argv)
QApplication::setGraphicsSystem(QLatin1String("raster"));
#endif
- QDeclarativeDebugHelper::enableDebugging();
-
Application app(argc, argv);
app.setApplicationName(QLatin1String("QtQmlViewer"));
app.setOrganizationName(QLatin1String("Nokia"));
diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro
index 8dc5808ad5..1f7a6024f4 100644
--- a/tools/qmlviewer/qmlviewer.pro
+++ b/tools/qmlviewer/qmlviewer.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
-CONFIG += qt uic
-DESTDIR = ../../bin
-QT += declarative qtquick1 qtquick1-private widgets widgets-private
+CONFIG += qt uic declarative_debug
+DESTDIR = $$QT.declarative.bins
+QT += declarative qtquick1 qtquick1-private widgets widgets-private
include(qml.pri)