diff options
| -rw-r--r-- | examples/serialport/master/master.pro | 8 | ||||
| -rw-r--r-- | examples/serialport/slave/slave.pro | 8 | ||||
| -rw-r--r-- | src/serialport/doc/qtserialport.qdocconf | 1 | ||||
| -rw-r--r-- | tests/auto/qserialportinfo/qserialportinfo.pro | 8 |
4 files changed, 5 insertions, 20 deletions
diff --git a/examples/serialport/master/master.pro b/examples/serialport/master/master.pro index 3eb9ddaa..77f2d575 100644 --- a/examples/serialport/master/master.pro +++ b/examples/serialport/master/master.pro @@ -1,9 +1,5 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets serialport - requires(qtConfig(combobox)) -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += widgets serialport +requires(qtConfig(combobox)) TARGET = master TEMPLATE = app diff --git a/examples/serialport/slave/slave.pro b/examples/serialport/slave/slave.pro index eb684ff6..3e17cf4c 100644 --- a/examples/serialport/slave/slave.pro +++ b/examples/serialport/slave/slave.pro @@ -1,9 +1,5 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets serialport - requires(qtConfig(combobox)) -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += widgets serialport +requires(qtConfig(combobox)) TARGET = slave TEMPLATE = app diff --git a/src/serialport/doc/qtserialport.qdocconf b/src/serialport/doc/qtserialport.qdocconf index fbb8e429..f72b1944 100644 --- a/src/serialport/doc/qtserialport.qdocconf +++ b/src/serialport/doc/qtserialport.qdocconf @@ -33,7 +33,6 @@ headerdirs += .. sourcedirs += .. exampledirs += ../../../examples/serialport imagedirs += images -excludedirs += ../qt4support examplesinstallpath = serialport diff --git a/tests/auto/qserialportinfo/qserialportinfo.pro b/tests/auto/qserialportinfo/qserialportinfo.pro index b3e49bdd..0cf4c1d5 100644 --- a/tests/auto/qserialportinfo/qserialportinfo.pro +++ b/tests/auto/qserialportinfo/qserialportinfo.pro @@ -1,11 +1,5 @@ -QT = core testlib +QT = core testlib serialport TARGET = tst_qserialportinfo #CONFIG += testcase -greaterThan(QT_MAJOR_VERSION, 4) { - QT += serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} - SOURCES = tst_qserialportinfo.cpp |