From 7cd68cfd66964e17399745e18d62f3cda56614f5 2012-09-12 10:06:22 From: Marek Rosa Date: 2012-09-12 10:06:22 Subject: [PATCH] Qt5: fix warnings about deprecated QT/CONFIG specification - CONFIG += designer replaced on Qt5 with QT += designer - CONFIG += qtestlib replaced on Qt5 with QT += testlib --- diff --git a/plugins/designer/designer.pro b/plugins/designer/designer.pro index 071eee8..1467794 100644 --- a/plugins/designer/designer.pro +++ b/plugins/designer/designer.pro @@ -4,10 +4,14 @@ TARGET=qtcommercialchartdesigner DESTDIR = $$CHART_BUILD_DESIGNER_PLUGIN_DIR -CONFIG += designer +greaterThan(QT_MAJOR_VERSION, 4) { + QT += designer +} else { + CONFIG += designer +} HEADERS = qchartsplugin.h SOURCES = qchartsplugin.cpp RESOURCES = qchartsplugin.qrc target.path = $$[QT_INSTALL_PLUGINS]/designer -INSTALLS += target \ No newline at end of file +INSTALLS += target diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index 71d26a6..424c8cd 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -2,7 +2,11 @@ error( "Couldn't find the tests.pri file!" ) } -CONFIG += qtestlib +greaterThan(QT_MAJOR_VERSION, 4) { + QT += testlib +} else { + CONFIG += qtestlib +} !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") INCLUDEPATH += ../inc