diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-02-05 19:58:09 +0000 |
|---|---|---|
| committer | Laszlo Papp <lpapp@kde.org> | 2013-02-06 10:39:32 +0100 |
| commit | 9a1c5596a2fc748e008f7c342e7533db96b2d9b9 (patch) | |
| tree | 438ee0d8769ab49322215b5fdea44275c0c3ad71 /examples | |
| parent | b412c0e0e90945b041dfd4615ae92fb95c67d000 (diff) | |
| download | qtserialport-9a1c5596a2fc748e008f7c342e7533db96b2d9b9.tar.gz | |
Unbreak the terminal example compilation
This is a workaround, and not a real fix as the whole namespace situation is a
mess for now, and has to be discussed with others. The real fix has to wait, but
the build has to be working right now off-hand.
Also, there is not much point in exposing this global header file for Qt4 either
as the usage of the two public classes should be enough along with the
deterministic namespace name that will be agreed upon later (i.e. the namespace
define will be removed most likely).
Tested with Qt5, and the terminal example builds just fine on ArchLinux.
Change-Id: I9609afb43997ed20bf9770b517a93121bff84d82
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/terminal/mainwindow.h | 6 |
1 files changed, 1 insertions, 5 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 |