summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-12-22 16:10:30 +0100
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-01-06 13:47:23 +0000
commit0ea5ab98585e6b519093edffc42a5996c30e2aa9 (patch)
tree5fa247a2e7f867ee7c2890780979d132bb25791d
parent05f85eade12ee28497f07b226ae3bb0acb5867ba (diff)
Remove Qt4 vestiges from project files
Change-Id: I69ab23fc88273a6e32592403c2e71d911e45e728 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
-rw-r--r--src/app/app.pro3
-rw-r--r--src/jomlib/jomlib.pro1
-rw-r--r--tests/tests.pro1
3 files changed, 1 insertions, 4 deletions
diff --git a/src/app/app.pro b/src/app/app.pro
index 3a24779..6ff0135 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -1,9 +1,8 @@
TEMPLATE = app
DESTDIR = ../../bin
QT = core
-CONFIG += console depend_includepath
+CONFIG += console
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
TARGET = jom
CONFIG(debug, debug|release) {
TARGET = $$join(TARGET,,,d)
diff --git a/src/jomlib/jomlib.pro b/src/jomlib/jomlib.pro
index 63408d3..f1b6f1d 100644
--- a/src/jomlib/jomlib.pro
+++ b/src/jomlib/jomlib.pro
@@ -5,7 +5,6 @@ QT = core
CONFIG += qt staticlib debug_and_release build_all
DEFINES += _CRT_SECURE_NO_WARNINGS
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
PRECOMPILED_HEADER = stable.h
build_pass:CONFIG(debug, debug|release) {
diff --git a/tests/tests.pro b/tests/tests.pro
index f365662..a65bab4 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,6 +1,5 @@
TEMPLATE = app
QT += testlib
-CONFIG += depend_includepath
INCLUDEPATH += ../src/jomlib
DEFINES += SRCDIR=\\\"$$PWD/\\\"