From 0412055322cf44c1127246ff817ab7a75b735680 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Mon, 1 Aug 2011 16:27:01 +1000 Subject: Don't enable qmlscene compability mode for commented out imports. Valid import statements should be at the start of a line, maybe preceded by some white space. Task-number: QTBUG-20649 Change-Id: I1944bce0d30e680ebdb0798f5ae4e8c91a057a13 Reviewed-on: http://codereview.qt.nokia.com/2423 Reviewed-by: Martin Jones Reviewed-by: Qt Sanity Bot --- tools/qmlscene/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 1d3641b61e..0d6f813a8e 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -358,8 +358,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; -- cgit v1.2.3 From 813135081a8e22b673d2673fc38884b595ec0d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 18 Apr 2011 17:20:49 +0200 Subject: Introduced a CONFIG option that enables declarative debug services This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: Iacfc5a9b2ca0c2610288cf86f190b4a9950cacd1 Reviewed-on: http://codereview.qt.nokia.com/2436 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- tools/qmlscene/main.cpp | 2 -- tools/qmlscene/qmlscene.pro | 2 +- tools/qmlviewer/main.cpp | 3 --- tools/qmlviewer/qmlviewer.pro | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 0d6f813a8e..e6603adbd8 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -56,7 +56,6 @@ #include #include -#include // ### This should be private API #include @@ -455,7 +454,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..7a722630e0 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -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/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 #include #include "qdeclarativetester.h" -#include 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 16579bb167..991d07c5a4 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qt uic +CONFIG += qt uic declarative_debug DESTDIR = ../../bin QT += declarative qtquick1 qtquick1-private -- cgit v1.2.3 From 98555bf15ff50d6e70f78098ec0296cbc48a2b25 Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Mon, 8 Aug 2011 11:35:01 +1000 Subject: remove app bundle config for mac Change-Id: I3b526dc556f714b5df712699f64b6bdc51971554 Reviewed-on: http://codereview.qt.nokia.com/2717 Reviewed-by: Qt Sanity Bot Reviewed-by: Charles Yin --- tools/qmltestrunner/qmltestrunner.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools') 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 -- cgit v1.2.3 From 55f7013439cda71d12d50e8ff94d8e5010644071 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 10 Aug 2011 15:06:35 +1000 Subject: Respect $$QT.declarative.bins A module's tools should build directly into $$QT..bins, just like its libraries and plugins. Change-Id: Ic5e885ae0fe99220e07fd643d9bb5b28008e0fa5 Reviewed-on: http://codereview.qt.nokia.com/2802 Reviewed-by: Qt Sanity Bot Reviewed-by: Kalle Lehtonen --- tools/qmlscene/qmlscene.pro | 2 +- tools/qmlviewer/qmlviewer.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 7a722630e0..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 diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index 991d07c5a4..5dd95b3ff2 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG += qt uic declarative_debug -DESTDIR = ../../bin +DESTDIR = $$QT.declarative.bins QT += declarative qtquick1 qtquick1-private include(qml.pri) -- cgit v1.2.3