QmlDesigner.autoTests: compilefix

Reviewed-by: Kai Koehne

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

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

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");
     }
 }