feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProjectManager: Remove dependency on qt quick 1 in a test

Browse Source 
Seems it wasn't actually required at all

Change-Id: I4c622057b7fd85a64f99368eb07b502aee524955
Task-number: QTCREATORBUG-14217
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-04-09 16:20:23 +02:00
parent 2eec1ec04f
commit 08c573fb0d
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
View File

@@ -1,8 +1,7 @@
QTC_LIB_DEPENDS += qmljs QTC_LIB_DEPENDS += qmljs
include(../../../qttest.pri) include(../../../qttest.pri)
QT += script \ QT += script
declarative
PLUGIN_DIR=$$IDE_SOURCE_TREE/src/plugins/qmlprojectmanager PLUGIN_DIR=$$IDE_SOURCE_TREE/src/plugins/qmlprojectmanager

2
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
View File

@@ -4,7 +4,7 @@ QtcAutotest {
name: "QmlProjectManager file format autotest" name: "QmlProjectManager file format autotest"
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
Depends { name: "Utils" } 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 Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat" property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat"
files: "tst_fileformat.cpp" files: "tst_fileformat.cpp"

3
tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
View File

@@ -31,9 +31,6 @@
#include "qmlprojectitem.h" #include "qmlprojectitem.h"
#include "filefilteritems.h" #include "filefilteritems.h"
#include "qmlprojectfileformat.h" #include "qmlprojectfileformat.h"
#include <QDeclarativeComponent>
#include <QDeclarativeContext>
#include <QDeclarativeEngine>
#include <QtTest> #include <QtTest>
//TESTED_COMPONENT=src/plugins/qmlprojectmanager/fileformat //TESTED_COMPONENT=src/plugins/qmlprojectmanager/fileformat