From 0c2819dafa67d5989ffb82283c36e1916db732b7 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 23 Oct 2014 16:20:03 +0400 Subject: Drop the Qt4 support Now QtSerialPort can be built for Qt5 only. QtSerialPort for Qt4 is developed in a separate branch. Change-Id: Iaaa95fb7cb0aedbfc1b17ed11717fff8f9c126a0 Reviewed-by: Sergey Belyashov --- examples/serialport/blockingmaster/blockingmaster.pro | 6 +----- examples/serialport/blockingslave/blockingslave.pro | 6 +----- examples/serialport/cenumerator/cenumerator.pro | 7 +------ examples/serialport/creaderasync/creaderasync.pro | 7 +------ examples/serialport/creadersync/creadersync.pro | 7 +------ examples/serialport/cwriterasync/cwriterasync.pro | 7 +------ examples/serialport/cwritersync/cwritersync.pro | 7 +------ examples/serialport/enumerator/enumerator.pro | 6 +----- examples/serialport/serialport.pro | 6 +----- examples/serialport/terminal/terminal.pro | 6 +----- 10 files changed, 10 insertions(+), 55 deletions(-) (limited to 'examples') diff --git a/examples/serialport/blockingmaster/blockingmaster.pro b/examples/serialport/blockingmaster/blockingmaster.pro index 5f21cdbf..8f3e0a15 100644 --- a/examples/serialport/blockingmaster/blockingmaster.pro +++ b/examples/serialport/blockingmaster/blockingmaster.pro @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += widgets serialport TARGET = blockingmaster TEMPLATE = app diff --git a/examples/serialport/blockingslave/blockingslave.pro b/examples/serialport/blockingslave/blockingslave.pro index 5a5fb78c..2477b52c 100644 --- a/examples/serialport/blockingslave/blockingslave.pro +++ b/examples/serialport/blockingslave/blockingslave.pro @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += widgets serialport TARGET = blockingslave TEMPLATE = app diff --git a/examples/serialport/cenumerator/cenumerator.pro b/examples/serialport/cenumerator/cenumerator.pro index 7f870342..f5494fd7 100644 --- a/examples/serialport/cenumerator/cenumerator.pro +++ b/examples/serialport/cenumerator/cenumerator.pro @@ -1,10 +1,5 @@ QT = core - -greaterThan(QT_MAJOR_VERSION, 4) { - QT += serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += serialport CONFIG += console CONFIG -= app_bundle diff --git a/examples/serialport/creaderasync/creaderasync.pro b/examples/serialport/creaderasync/creaderasync.pro index 27b17dc9..3565dc9e 100644 --- a/examples/serialport/creaderasync/creaderasync.pro +++ b/examples/serialport/creaderasync/creaderasync.pro @@ -1,10 +1,5 @@ QT = core - -greaterThan(QT_MAJOR_VERSION, 4) { - QT += serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += serialport CONFIG += console CONFIG -= app_bundle diff --git a/examples/serialport/creadersync/creadersync.pro b/examples/serialport/creadersync/creadersync.pro index 3e9a1991..ee9eaf23 100644 --- a/examples/serialport/creadersync/creadersync.pro +++ b/examples/serialport/creadersync/creadersync.pro @@ -1,10 +1,5 @@ QT = core - -greaterThan(QT_MAJOR_VERSION, 4) { - QT += serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += serialport CONFIG += console CONFIG -= app_bundle diff --git a/examples/serialport/cwriterasync/cwriterasync.pro b/examples/serialport/cwriterasync/cwriterasync.pro index 8a64cebd..0945f1d4 100644 --- a/examples/serialport/cwriterasync/cwriterasync.pro +++ b/examples/serialport/cwriterasync/cwriterasync.pro @@ -1,10 +1,5 @@ QT = core - -greaterThan(QT_MAJOR_VERSION, 4) { - QT += serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += serialport CONFIG += console CONFIG -= app_bundle diff --git a/examples/serialport/cwritersync/cwritersync.pro b/examples/serialport/cwritersync/cwritersync.pro index 14cba72c..08f50a28 100644 --- a/examples/serialport/cwritersync/cwritersync.pro +++ b/examples/serialport/cwritersync/cwritersync.pro @@ -1,10 +1,5 @@ QT = core - -greaterThan(QT_MAJOR_VERSION, 4) { - QT += serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += serialport CONFIG += console CONFIG -= app_bundle diff --git a/examples/serialport/enumerator/enumerator.pro b/examples/serialport/enumerator/enumerator.pro index 21233a80..9819fd7d 100644 --- a/examples/serialport/enumerator/enumerator.pro +++ b/examples/serialport/enumerator/enumerator.pro @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += widgets serialport TARGET = enumerator TEMPLATE = app diff --git a/examples/serialport/serialport.pro b/examples/serialport/serialport.pro index ba8d1671..c0e77dfd 100644 --- a/examples/serialport/serialport.pro +++ b/examples/serialport/serialport.pro @@ -1,8 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = cenumerator creaderasync creadersync cwriterasync cwritersync -greaterThan(QT_MAJOR_VERSION, 4) { - !isEmpty(QT.widgets.name):SUBDIRS += enumerator terminal blockingmaster blockingslave -} else { - SUBDIRS += enumerator terminal blockingmaster blockingslave master slave -} +!isEmpty(QT.widgets.name):SUBDIRS += enumerator terminal blockingmaster blockingslave diff --git a/examples/serialport/terminal/terminal.pro b/examples/serialport/terminal/terminal.pro index 0a5b545a..1e45e557 100644 --- a/examples/serialport/terminal/terminal.pro +++ b/examples/serialport/terminal/terminal.pro @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets serialport -} else { - include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) -} +QT += widgets serialport TARGET = terminal TEMPLATE = app -- cgit v1.2.3