diff --git a/src/plugins/qmldesigner/config.pri b/src/plugins/qmldesigner/config.pri deleted file mode 100644 index 1b559b2fade..00000000000 --- a/src/plugins/qmldesigner/config.pri +++ /dev/null @@ -1,11 +0,0 @@ -# MOC_DIR = moc -debug { - DEFINES += VIEWLOGGER -} - -TMP_BAUHAUS_NO_OUTPUT = $$[BAUHAUS_NO_OUTPUT] -equals(TMP_BAUHAUS_NO_OUTPUT, true):DEFINES += QT_NO_DEBUG_OUTPUT \ - QT_NO_WARNING_OUTPUT -DEFINES += ENABLE_TEXT_VIEW - -isEmpty($$(BAUHAUS_OUTPUT_IN_TEST)):DEFINES += QDEBUG_IN_TESTS WARNINGS_IN_TESTS diff --git a/tests/auto/qml/qmldesigner/common/statichelpers.cpp b/tests/auto/qml/qmldesigner/common/statichelpers.cpp index bca28e450e4..539e697c33c 100644 --- a/tests/auto/qml/qmldesigner/common/statichelpers.cpp +++ b/tests/auto/qml/qmldesigner/common/statichelpers.cpp @@ -23,28 +23,6 @@ ** ****************************************************************************/ -//static void testMessageOutput(QtMsgType type, const char *msg) -// { -// switch (type) { -// case QtDebugMsg: -//#ifdef QDEBUG_IN_TESTS -// std::fprintf(stderr, "Debug: %s\n", msg); -//#endif // QDEBUG_IN_TESTS -// break; -// case QtWarningMsg: -//#ifdef WARNINGS_IN_TESTS -// std::fprintf(stderr, "Warning: %s\n", msg); -//#endif // WARNINGS_IN_TESTS -// break; -// case QtCriticalMsg: -// std::fprintf(stderr, "Critical: %s\n", msg); -// break; -// case QtFatalMsg: -// std::fprintf(stderr, "Fatal: %s\n", msg); -// break; -// } -// } - static ModelNode addNodeListChild(const ModelNode &parentNode, const QString &typeName, int major, int minor, const QString &parentProperty) { ModelNode newNode = parentNode.view()->createModelNode(typeName.toUtf8(), major, minor); diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro index af6a55753f7..22f417593b3 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -9,7 +9,6 @@ QTC_PLUGIN_DEPENDS += \ qmljseditor include(../../../qttest.pri) -include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) QT += network core-private diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 34ba813b1ae..9a40c3c7dc8 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -175,9 +175,6 @@ tst_TestCore::tst_TestCore() void tst_TestCore::initTestCase() { -#ifndef QDEBUG_IN_TESTS - qInstallMsgHandler(testMessageOutput); -#endif Exception::setShouldAssert(false); initializeMetaTypeSystem(QLatin1String(QTCREATORDIR "/share/qtcreator"));