From 341464cd84a72808e0cc8b2c3b28f1c0a7c5e43f Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 16 Nov 2009 14:17:35 +1000 Subject: Remove dead code --- src/declarative/qml/qml.pri | 3 --- src/declarative/qml/qmlengine.cpp | 16 ---------------- src/declarative/qml/qmlengine_p.h | 4 ---- 3 files changed, 23 deletions(-) diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index ee13437..ca78797 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -111,9 +111,6 @@ HEADERS += qml/qmlparser_p.h \ qml/qmltypenamescriptclass_p.h \ qml/qmllistscriptclass_p.h -# for qtscript debugger -contains(QT_CONFIG, scripttools):QT += scripttools - QT += sql include(parser/parser.pri) diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 66d4990..1483c8c 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -47,10 +47,6 @@ #include #include -#ifdef QT_SCRIPTTOOLS_LIB -#include -#endif - #include #include #include @@ -101,7 +97,6 @@ Q_DECLARE_METATYPE(QList); QT_BEGIN_NAMESPACE -DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER) DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) QML_DEFINE_TYPE(Qt,4,6,Object,QObject) @@ -232,12 +227,6 @@ void QmlEnginePrivate::init() typeNameClass = new QmlTypeNameScriptClass(q); listClass = new QmlListScriptClass(q); rootContext = new QmlContext(q,true); -#ifdef QT_SCRIPTTOOLS_LIB - if (qmlDebugger()){ - debugger = new QScriptEngineDebugger(q); - debugger->attachTo(&scriptEngine); - } -#endif if (QCoreApplication::instance()->thread() == q->thread() && QmlEngineDebugServer::isDebuggingEnabled()) { @@ -249,11 +238,6 @@ void QmlEnginePrivate::init() } } -QmlEnginePrivate::CapturedProperty::CapturedProperty(const QmlMetaProperty &p) -: object(p.object()), coreIndex(p.coreIndex()), notifyIndex(p.property().notifySignalIndex()) -{ -} - /*! \class QmlEngine \brief The QmlEngine class provides an environment for instantiating QML components. diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 2e880bb..2f41651 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -112,7 +112,6 @@ public: struct CapturedProperty { CapturedProperty(QObject *o, int c, int n) : object(o), coreIndex(c), notifyIndex(n) {} - CapturedProperty(const QmlMetaProperty &); QObject *object; int coreIndex; @@ -123,9 +122,6 @@ public: QmlContext *rootContext; QmlExpression *currentExpression; bool isDebugging; -#ifdef QT_SCRIPTTOOLS_LIB - QScriptEngineDebugger *debugger; -#endif struct ImportedNamespace; QmlContextScriptClass *contextClass; -- cgit v0.12 From 15e8301c3029646bfc2b78b821a0688ee7b287ae Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 16 Nov 2009 14:27:46 +1000 Subject: Improve Qt.lighter()/darker() tests --- tests/auto/declarative/qmlqt/data/darker.qml | 3 +++ tests/auto/declarative/qmlqt/data/lighter.qml | 3 +++ tests/auto/declarative/qmlqt/tst_qmlqt.cpp | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/tests/auto/declarative/qmlqt/data/darker.qml b/tests/auto/declarative/qmlqt/data/darker.qml index 6369e8f..96ffa77 100644 --- a/tests/auto/declarative/qmlqt/data/darker.qml +++ b/tests/auto/declarative/qmlqt/data/darker.qml @@ -4,5 +4,8 @@ Object { property var test1: Qt.darker(Qt.rgba(1, 0.8, 0.3)) property var test2: Qt.darker() property var test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 10) + property var test4: Qt.darker("red"); + property var test5: Qt.darker("perfectred"); // Non-existant color + property var test6: Qt.darker(10); } diff --git a/tests/auto/declarative/qmlqt/data/lighter.qml b/tests/auto/declarative/qmlqt/data/lighter.qml index 6c888e7..2e9fdc8 100644 --- a/tests/auto/declarative/qmlqt/data/lighter.qml +++ b/tests/auto/declarative/qmlqt/data/lighter.qml @@ -4,4 +4,7 @@ Object { property var test1: Qt.lighter(Qt.rgba(1, 0.8, 0.3)) property var test2: Qt.lighter() property var test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 10) + property var test4: Qt.lighter("red"); + property var test5: Qt.lighter("perfectred"); // Non-existant color + property var test6: Qt.lighter(10); } diff --git a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp b/tests/auto/declarative/qmlqt/tst_qmlqt.cpp index 13f4904..4d09aee 100644 --- a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp +++ b/tests/auto/declarative/qmlqt/tst_qmlqt.cpp @@ -213,6 +213,9 @@ void tst_qmlqt::lighter() QCOMPARE(qvariant_cast(object->property("test1")), QColor::fromRgbF(1, 0.8, 0.3).lighter()); QCOMPARE(qvariant_cast(object->property("test2")), QColor()); QCOMPARE(qvariant_cast(object->property("test3")), QColor()); + QCOMPARE(qvariant_cast(object->property("test4")), QColor("red").lighter()); + QCOMPARE(qvariant_cast(object->property("test5")), QColor()); + QCOMPARE(qvariant_cast(object->property("test6")), QColor()); delete object; } @@ -226,6 +229,9 @@ void tst_qmlqt::darker() QCOMPARE(qvariant_cast(object->property("test1")), QColor::fromRgbF(1, 0.8, 0.3).darker()); QCOMPARE(qvariant_cast(object->property("test2")), QColor()); QCOMPARE(qvariant_cast(object->property("test3")), QColor()); + QCOMPARE(qvariant_cast(object->property("test4")), QColor("red").darker()); + QCOMPARE(qvariant_cast(object->property("test5")), QColor()); + QCOMPARE(qvariant_cast(object->property("test6")), QColor()); delete object; } -- cgit v0.12