diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 16:52:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 00:39:18 +0100 |
| commit | 01dc7e2ea476e0e6dcdce2e72979bbc858f4057d (patch) | |
| tree | d8796f7695bbf8ad42abf47cd84c1b5e000ef795 /tests/auto/declarative/debugger | |
| parent | 5e07b57b818326da47a46d384415041fa4cea0ba (diff) | |
Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.
Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/debugger')
3 files changed, 2 insertions, 9 deletions
diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro index 90595df881..6433631c4b 100644 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro +++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro @@ -1,5 +1,5 @@ TARGET = app -QT += declarative quick widgets qtquick1 +QT += declarative quick widgets CONFIG += declarative_debug macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp index 03db274201..a7ef09c283 100644 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp +++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp @@ -43,7 +43,6 @@ #include <QtCore/QStringList> #include <QtQuick/QQuickView> #include <QtGui/QGuiApplication> -#include <QtQuick1/QDeclarativeView> int main(int argc, char *argv[]) { @@ -66,8 +65,7 @@ int main(int argc, char *argv[]) QQuickView *view = new QQuickView(); view->setSource(QUrl::fromLocalFile("app/qtquick2.qml")); } else { - QDeclarativeView *view = new QDeclarativeView(); - view->setSource(QUrl::fromLocalFile("app/qtquick1.qml")); + qWarning("No suitable QtQuick1 implementation is available!"); } return app.exec(); } diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/qtquick1.qml b/tests/auto/declarative/debugger/qdeclarativeinspector/app/qtquick1.qml deleted file mode 100644 index 1709ef14a4..0000000000 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/qtquick1.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 1.0 - -Item { - -} |