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

QmlDesigner: remove unused code

Browse Source 
Change-Id: I4c888f69d3bedc510f0f0a9f67d96caf17c4bcee
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-06-10 15:58:24 +02:00
parent 4d008299f3
commit 0a67076ef4
4 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/config.pri
View File

@@ -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

22
tests/auto/qml/qmldesigner/common/statichelpers.cpp
View File

@@ -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) 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); ModelNode newNode = parentNode.view()->createModelNode(typeName.toUtf8(), major, minor);

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

@@ -9,7 +9,6 @@ QTC_PLUGIN_DEPENDS += \
qmljseditor qmljseditor
include(../../../qttest.pri) include(../../../qttest.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
QT += network core-private QT += network core-private

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

@@ -175,9 +175,6 @@ tst_TestCore::tst_TestCore()
void tst_TestCore::initTestCase() void tst_TestCore::initTestCase()
{ {
#ifndef QDEBUG_IN_TESTS
qInstallMsgHandler(testMessageOutput);
#endif
Exception::setShouldAssert(false); Exception::setShouldAssert(false);
initializeMetaTypeSystem(QLatin1String(QTCREATORDIR "/share/qtcreator")); initializeMetaTypeSystem(QLatin1String(QTCREATORDIR "/share/qtcreator"));