From 6e388a3941fcd52948bdeb0c55365ea0417d80c8 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 26 May 2010 15:34:26 +0200
Subject: [PATCH] QmlDesigner.autoTests: compilefix
Reviewed-by: Kai Koehne
---
tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro | 2 +-
.../propertyeditortests/propertyeditortests.pro | 2 +-
.../propertyeditortests/testpropertyeditor.cpp | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
index 79e8a180cc5..33e3634f207 100644
--- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
+++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
@@ -2,7 +2,7 @@ include(../../../../../src/plugins/qmldesigner/config.pri)
QT += testlib
DESTDIR = $$DESIGNER_BINARY_DIRECTORY
-include(../../../../../src/plugins/qmldesigner/core/core.pri)
+include(../../../../../src/plugins/qmldesigner/designercore/designercore.pri)
include(../../../../../src/libs/qmljs/qmljs-lib.pri)
HEADERS+=../../../../../src/libs/utils/changeset.h
SOURCES+=../../../../../src/libs/utils/changeset.cpp
diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
index 0f353ce58de..6e387052ea8 100644
--- a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
+++ b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
@@ -5,7 +5,7 @@ QT += testlib \
script \
declarative
DESTDIR = $$DESIGNER_BINARY_DIRECTORY
-include(../../../../../src/plugins/qmldesigner/core/core.pri)
+include(../../../../../src/plugins/qmldesigner/designercore/designercore.pri)
include(../../../../../src/libs/qmljs/qmljs-lib.pri)
HEADERS+=../../../../../src/libs/utils/changeset.h
SOURCES+=../../../../../src/libs/utils/changeset.cpp
diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp
index ce87286849d..3b4a6ea0d19 100644
--- a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp
+++ b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp
@@ -40,6 +40,7 @@
#include <bytearraymodifier.h>
#include <invalididexception.h>
#include <invalidmodelnodeexception.h>
+#include <nodeproperty.h>
#include <propertyeditor.h>
#include <QDebug>
#include <QDir>
@@ -51,6 +52,7 @@
using namespace QmlDesigner;
+#include <cstdio>
#include "../common/statichelpers.cpp"
@@ -173,7 +175,9 @@ TestPropertyEditor::TestPropertyEditor()
void TestPropertyEditor::initTestCase()
{
+#ifndef QDEBUG_IN_TESTS
qInstallMsgHandler(testMessageOutput);
+#endif
Exception::setShouldAssert(false);
}
@@ -197,7 +201,7 @@ void TestPropertyEditor::createCoreModel()
int numberOfProperties = view->rootModelNode().propertyNames().count();
selectThrough(view->rootModelNode());
QCOMPARE(view->rootModelNode().propertyNames().count(), numberOfProperties);
- } catch (Exception &exception) {
+ } catch (Exception &) {
QFAIL("Exception thrown");
}
}
@@ -307,7 +311,7 @@ void TestPropertyEditor::createRect()
QCOMPARE(childNode.propertyNames().count(), 4);
QCOMPARE(childNode.variantProperty("scale").value(), QVariant());
- } catch (Exception &exception) {
+ } catch (Exception &) {
QFAIL("Exception thrown");
}
}
--
GitLab