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

QmlDesigner.Tests: Compiling again

Browse Source 
Change-Id: I85a7fc5c37d9beea6e2433a9fd2a3ef779f0d63c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
This commit is contained in:
Marco Bubke
2012-09-03 17:34:28 +02:00
parent e3eea3a935
commit b19bebbfa5
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/qml/qmldesigner/coretests/coretests.pro
View File

@@ -1,15 +1,17 @@
include(../../../qttest.pri) IDE_SOURCE_TREE=$$PWD/../../../../..
IDE_BUILD_TREE=$$OUT_PWD/../../../../..
QTCREATOR_SOURCE=$$PWD/../../../../..
QTCREATOR_BUILD=$$OUT_PWD/../../../../..
# can we check that this is a valid build dir? # can we check that this is a valid build dir?
message($$IDE_SOURCE_TREE)
message($$IDE_BUILD_TREE)
OUT_PWD_SAVE=$$OUT_PWD OUT_PWD_SAVE=$$OUT_PWD
OUT_PWD=QTCREATOR_BUILD OUT_PWD=IDE_BUILD_TREE
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
include(../../../qttest.pri)
OUT_PWD=$$OUT_PWD_SAVE OUT_PWD=$$OUT_PWD_SAVE
message($$IDE_LIBRARY_PATH)
message($$IDE_PLUGIN_PATH)
LIBS += -L$$IDE_PLUGIN_PATH/Nokia LIBS += -L$$IDE_PLUGIN_PATH/Nokia
LIBS += -L$$IDE_LIBRARY_PATH
unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/Nokia\' unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/Nokia\'
@@ -24,10 +26,15 @@ DEFINES+=QT_CREATOR QTCREATOR_TEST
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
INCLUDEPATH += $$IDE_SOURCE_TREE//share/qtcreator/qml/qmlpuppet
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri) include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmljstools/qmljstools.pri) include($$IDE_SOURCE_TREE/src/plugins/qmljstools/qmljstools.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle

10
tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
View File

@@ -75,6 +75,7 @@ using namespace QmlDesigner;
#include "../common/statichelpers.cpp" #include "../common/statichelpers.cpp"
#include <qmljstools/qmljsmodelmanager.h> #include <qmljstools/qmljsmodelmanager.h>
#include <qmljs/qmljsinterpreter.h>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
# define SHARE_PATH "/Resources" # define SHARE_PATH "/Resources"
@@ -108,9 +109,10 @@ static void initializeMetaTypeSystem(const QString &resourcePath)
QDir::Files, QDir::Files,
QDir::Name); QDir::Name);
const QStringList errors = QmlJS::Interpreter::CppQmlTypesLoader::loadQmlTypes(qmlFiles); QStringList errorsAndWarnings;
foreach (const QString &error, errors) QmlJS::CppQmlTypesLoader::loadQmlTypes(qmlFiles, &errorsAndWarnings, &errorsAndWarnings);
qWarning() << qPrintable(error); foreach (const QString &errorAndWarning, errorsAndWarnings)
qWarning() << qPrintable(errorAndWarning);
} }
tst_TestCore::tst_TestCore() tst_TestCore::tst_TestCore()
@@ -3478,7 +3480,7 @@ void tst_TestCore::testSubComponentManager()
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
model->setFileUrl(QUrl::fromLocalFile(fileName)); model->setFileUrl(QUrl::fromLocalFile(fileName));
QScopedPointer<SubComponentManager> subComponentManager(new SubComponentManager(model->metaInfo(), 0)); QScopedPointer<SubComponentManager> subComponentManager(new SubComponentManager(model.data()));
subComponentManager->update(QUrl::fromLocalFile(fileName), model->imports()); subComponentManager->update(QUrl::fromLocalFile(fileName), model->imports());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView()); QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());

6
tests/auto/qml/qmldesigner/testview.cpp
View File

@@ -152,10 +152,10 @@ void TestView::nodeOrderChanged(const QmlDesigner::NodeListProperty &listPropert
m_methodCalls += MethodCall("nodeOrderChanged", QStringList() << listProperty.name() << movedNode.id() << QString::number(oldIndex)); m_methodCalls += MethodCall("nodeOrderChanged", QStringList() << listProperty.name() << movedNode.id() << QString::number(oldIndex));
} }
void TestView::stateChanged(const QmlDesigner::QmlModelState &newQmlModelState, const QmlDesigner::QmlModelState &oldQmlModelState) void TestView::actualStateChanged(const QmlDesigner::ModelNode &node)
{ {
QmlDesigner::QmlModelView::stateChanged(newQmlModelState, oldQmlModelState); QmlDesigner::QmlModelView::actualStateChanged(node);
m_methodCalls += MethodCall("stateChanged", QStringList() << newQmlModelState.name() << oldQmlModelState.name()); m_methodCalls += MethodCall("actualStateChanged", QStringList() << node.id());
} }
QList<TestView::MethodCall> &TestView::methodCalls() QList<TestView::MethodCall> &TestView::methodCalls()

3
tests/auto/qml/qmldesigner/testview.h
View File

@@ -73,8 +73,7 @@ public:
void nodeOrderChanged(const QmlDesigner::NodeListProperty &listProperty, const QmlDesigner::ModelNode &movedNode, int oldIndex); void nodeOrderChanged(const QmlDesigner::NodeListProperty &listProperty, const QmlDesigner::ModelNode &movedNode, int oldIndex);
void stateChanged(const QmlDesigner::QmlModelState &newQmlModelState, const QmlDesigner::QmlModelState &oldQmlModelState); void actualStateChanged(const QmlDesigner::ModelNode &node);
QList<MethodCall> &methodCalls(); QList<MethodCall> &methodCalls();
QString lastFunction() const; QString lastFunction() const;