diff options
| -rw-r--r-- | examples/terminal/mainwindow.h | 6 | ||||
| -rw-r--r-- | src/serialport/qt4support/install-helper.pri | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/examples/terminal/mainwindow.h b/examples/terminal/mainwindow.h index 3de45e2..24e9826 100644 --- a/examples/terminal/mainwindow.h +++ b/examples/terminal/mainwindow.h @@ -47,7 +47,7 @@ #include <QMainWindow> -#include <QtSerialPort/QSerialPortGlobal> +#include <QtSerialPort/QSerialPort> namespace Ui { class MainWindow; @@ -56,10 +56,6 @@ class MainWindow; class Console; class SettingsDialog; -QT_BEGIN_NAMESPACE_SERIALPORT -class QSerialPort; -QT_END_NAMESPACE_SERIALPORT - QT_USE_NAMESPACE_SERIALPORT class MainWindow : public QMainWindow diff --git a/src/serialport/qt4support/install-helper.pri b/src/serialport/qt4support/install-helper.pri index 1fb1fb1..aae2e83 100644 --- a/src/serialport/qt4support/install-helper.pri +++ b/src/serialport/qt4support/install-helper.pri @@ -11,11 +11,9 @@ for(header_file, PUBLIC_HEADERS) { # 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\"") } |