diff options
author | Laszlo Papp <lpapp@kde.org> | 2013-01-30 03:35:29 +0000 |
---|---|---|
committer | Laszlo Papp <lpapp@kde.org> | 2013-01-30 10:04:45 +0100 |
commit | 89b1e793633dd90fc914d01bc3c668e8e2d8b26b (patch) | |
tree | 01e2173e173d1d2cd583f45cb7520f2d63765fbf | |
parent | c1c469f6cbd83021765fa53ef70f4b119262446e (diff) | |
download | qtserialport-89b1e793633dd90fc914d01bc3c668e8e2d8b26b.tar.gz |
Make the cross Qt4/5 versions experience better with forward headers
This is not a nice way, but quick of getting this feature done. For future
reference, we should most likely do something as QtCreator does for instance
with "QMAKE_SUBSTITUTES".
Change-Id: I3df23ac019552f9586aede336296079109066da1
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r-- | examples/blockingmaster/dialog.cpp | 2 | ||||
-rw-r--r-- | examples/blockingmaster/masterthread.cpp | 2 | ||||
-rw-r--r-- | examples/blockingslave/dialog.cpp | 2 | ||||
-rw-r--r-- | examples/blockingslave/slavethread.cpp | 2 | ||||
-rw-r--r-- | examples/cenumerator/main.cpp | 2 | ||||
-rw-r--r-- | examples/enumerator/main.cpp | 2 | ||||
-rw-r--r-- | examples/master/dialog.cpp | 2 | ||||
-rw-r--r-- | examples/master/dialog.h | 2 | ||||
-rw-r--r-- | examples/slave/dialog.cpp | 2 | ||||
-rw-r--r-- | examples/slave/dialog.h | 2 | ||||
-rw-r--r-- | examples/slave/slavethread.cpp | 2 | ||||
-rw-r--r-- | examples/terminal/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/terminal/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/terminal/settingsdialog.cpp | 2 | ||||
-rw-r--r-- | examples/terminal/settingsdialog.h | 2 | ||||
-rw-r--r-- | src/serialport/qt4support/install-helper.pri | 18 |
16 files changed, 33 insertions, 15 deletions
diff --git a/examples/blockingmaster/dialog.cpp b/examples/blockingmaster/dialog.cpp index 74c5fef..1686ad9 100644 --- a/examples/blockingmaster/dialog.cpp +++ b/examples/blockingmaster/dialog.cpp @@ -48,7 +48,7 @@ #include <QPushButton> #include <QGridLayout> -#include <QtSerialPort/qserialportinfo.h> +#include <QtSerialPort/QSerialPortInfo> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/blockingmaster/masterthread.cpp b/examples/blockingmaster/masterthread.cpp index 9a998fa..8d72b42 100644 --- a/examples/blockingmaster/masterthread.cpp +++ b/examples/blockingmaster/masterthread.cpp @@ -41,7 +41,7 @@ #include "masterthread.h" -#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/QSerialPort> #include <QTime> diff --git a/examples/blockingslave/dialog.cpp b/examples/blockingslave/dialog.cpp index 5788113..947de74 100644 --- a/examples/blockingslave/dialog.cpp +++ b/examples/blockingslave/dialog.cpp @@ -48,7 +48,7 @@ #include <QPushButton> #include <QGridLayout> -#include <QtSerialPort/qserialportinfo.h> +#include <QtSerialPort/QSerialPortInfo> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/blockingslave/slavethread.cpp b/examples/blockingslave/slavethread.cpp index 3ac8898..678c19f 100644 --- a/examples/blockingslave/slavethread.cpp +++ b/examples/blockingslave/slavethread.cpp @@ -41,7 +41,7 @@ #include "slavethread.h" -#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/QSerialPort> #include <QTime> diff --git a/examples/cenumerator/main.cpp b/examples/cenumerator/main.cpp index 83e99cf..8dd14a9 100644 --- a/examples/cenumerator/main.cpp +++ b/examples/cenumerator/main.cpp @@ -41,7 +41,7 @@ #include <QTextStream> #include <QCoreApplication> -#include <QtSerialPort/qserialportinfo.h> +#include <QtSerialPort/QSerialPortInfo> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/enumerator/main.cpp b/examples/enumerator/main.cpp index 396209e..15e4351 100644 --- a/examples/enumerator/main.cpp +++ b/examples/enumerator/main.cpp @@ -44,7 +44,7 @@ #include <QWidget> #include <QVBoxLayout> #include <QLabel> -#include <QtSerialPort/qserialportinfo.h> +#include <QtSerialPort/QSerialPortInfo> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/master/dialog.cpp b/examples/master/dialog.cpp index 71fb202..4319a5b 100644 --- a/examples/master/dialog.cpp +++ b/examples/master/dialog.cpp @@ -48,7 +48,7 @@ #include <QPushButton> #include <QGridLayout> -#include <QtSerialPort/qserialportinfo.h> +#include <QtSerialPort/QSerialPortInfo> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/master/dialog.h b/examples/master/dialog.h index 93348a5..6f6d64c 100644 --- a/examples/master/dialog.h +++ b/examples/master/dialog.h @@ -45,7 +45,7 @@ #include <QDialog> #include <QTimer> -#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/QSerialPort> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/slave/dialog.cpp b/examples/slave/dialog.cpp index 2d00d2b..fcfb36c 100644 --- a/examples/slave/dialog.cpp +++ b/examples/slave/dialog.cpp @@ -48,7 +48,7 @@ #include <QPushButton> #include <QGridLayout> -#include <QtSerialPort/qserialportinfo.h> +#include <QtSerialPort/QSerialPortInfo> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/slave/dialog.h b/examples/slave/dialog.h index 1b0c704..bd3a431 100644 --- a/examples/slave/dialog.h +++ b/examples/slave/dialog.h @@ -45,7 +45,7 @@ #include <QDialog> #include <QTimer> -#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/QSerialPort> QT_USE_NAMESPACE_SERIALPORT diff --git a/examples/slave/slavethread.cpp b/examples/slave/slavethread.cpp index d18e2cc..fc99c4a 100644 --- a/examples/slave/slavethread.cpp +++ b/examples/slave/slavethread.cpp @@ -41,7 +41,7 @@ #include "slavethread.h" -#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/QSerialPort> #include <QTime> diff --git a/examples/terminal/mainwindow.cpp b/examples/terminal/mainwindow.cpp index b2d276c..b0e7b2c 100644 --- a/examples/terminal/mainwindow.cpp +++ b/examples/terminal/mainwindow.cpp @@ -46,7 +46,7 @@ #include "settingsdialog.h" #include <QMessageBox> -#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/QSerialPort> //! [0] MainWindow::MainWindow(QWidget *parent) : diff --git a/examples/terminal/mainwindow.h b/examples/terminal/mainwindow.h index 7e248d4..3de45e2 100644 --- a/examples/terminal/mainwindow.h +++ b/examples/terminal/mainwindow.h @@ -47,7 +47,7 @@ #include <QMainWindow> -#include <QtSerialPort/qserialport-global.h> +#include <QtSerialPort/QSerialPortGlobal> namespace Ui { class MainWindow; diff --git a/examples/terminal/settingsdialog.cpp b/examples/terminal/settingsdialog.cpp index 1abc591..81f2f2a 100644 --- a/examples/terminal/settingsdialog.cpp +++ b/examples/terminal/settingsdialog.cpp @@ -43,7 +43,7 @@ #include "settingsdialog.h" #include "ui_settingsdialog.h" -#include <QtSerialPort/qserialportinfo.h> +#include <QtSerialPort/QSerialPortInfo> #include <QIntValidator> #include <QLineEdit> diff --git a/examples/terminal/settingsdialog.h b/examples/terminal/settingsdialog.h index ce1519b..e156c5b 100644 --- a/examples/terminal/settingsdialog.h +++ b/examples/terminal/settingsdialog.h @@ -44,7 +44,7 @@ #define SETTINGSDIALOG_H #include <QDialog> -#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/QSerialPort> namespace Ui { class SettingsDialog; diff --git a/src/serialport/qt4support/install-helper.pri b/src/serialport/qt4support/install-helper.pri index 179e5b2..1fb1fb1 100644 --- a/src/serialport/qt4support/install-helper.pri +++ b/src/serialport/qt4support/install-helper.pri @@ -8,6 +8,24 @@ for(header_file, PUBLIC_HEADERS) { system("$$QMAKE_COPY \"$${header_file}\" \"$$QTSERIALPORT_PROJECT_INCLUDEDIR\"") } +# This is a quick workaround for generating forward header with Qt4. + +unix { + system("echo \'$${LITERAL_HASH}include \"qserialport-global.h\"\' > \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPortGlobal\"") + system("echo \'$${LITERAL_HASH}include \"qserialport.h\"\' > \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPort\"") + system("echo \'$${LITERAL_HASH}include \"qserialportinfo.h\"\' > \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPortInfo\"") +} win32 { + system("echo $${LITERAL_HASH}include \"qserialport-global.h\" > \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPortGlobal\"") + system("echo $${LITERAL_HASH}include \"qserialport.h\" > \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPort\"") + system("echo $${LITERAL_HASH}include \"qserialportinfo.h\" > \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPortInfo\"") +} + +PUBLIC_HEADERS += \ + $$PUBLIC_HEADERS \ + \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPortGlobal\" \ + \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPort\" \ + \"$$QTSERIALPORT_PROJECT_INCLUDEDIR/QSerialPortInfo\" + target_headers.files = $$PUBLIC_HEADERS target_headers.path = $$[QT_INSTALL_PREFIX]/include/QtSerialPort INSTALLS += target_headers |