From 08c573fb0d9ebc48d4c17f3ee126cb03147be0ec Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Thu, 9 Apr 2015 16:20:23 +0200
Subject: [PATCH] QmlProjectManager: Remove dependency on qt quick 1 in a test
Seems it wasn't actually required at all
Change-Id: I4c622057b7fd85a64f99368eb07b502aee524955
Task-number: QTCREATORBUG-14217
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro | 3 +--
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs | 2 +-
tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp | 3 ---
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
index e85200c64ec..567364c106d 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
@@ -1,8 +1,7 @@
QTC_LIB_DEPENDS += qmljs
include(../../../qttest.pri)
-QT += script \
- declarative
+QT += script
PLUGIN_DIR=$$IDE_SOURCE_TREE/src/plugins/qmlprojectmanager
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
index 0cc8f0aaf76..f6163c4e676 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
@@ -4,7 +4,7 @@ QtcAutotest {
name: "QmlProjectManager file format autotest"
Depends { name: "QmlJS" }
Depends { name: "Utils" }
- Depends { name: "Qt"; submodules: ["script", "declarative"]; }
+ Depends { name: "Qt"; submodules: ["script"]; }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat"
files: "tst_fileformat.cpp"
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
index d57fea17329..50b518e0dab 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
@@ -31,9 +31,6 @@
#include "qmlprojectitem.h"
#include "filefilteritems.h"
#include "qmlprojectfileformat.h"
-#include <QDeclarativeComponent>
-#include <QDeclarativeContext>
-#include <QDeclarativeEngine>
#include <QtTest>
//TESTED_COMPONENT=src/plugins/qmlprojectmanager/fileformat
--
GitLab