diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-02-08 08:57:51 +0000 |
|---|---|---|
| committer | Laszlo Papp <lpapp@kde.org> | 2013-02-08 10:03:48 +0100 |
| commit | 2abbf141752cd2e5fef54e07058f2ddb71f0b1a7 (patch) | |
| tree | a46e21e0decdafcefff2fbaa6922864db986ca5a /examples | |
| parent | d79785cb977ad36cb71c88edb572e7082e96675f (diff) | |
| download | qtserialport-2abbf141752cd2e5fef54e07058f2ddb71f0b1a7.tar.gz | |
Fix the breakage for the terminal example when custom namespace is defined
This is currently causing breakages on the CI machine, but it is a generic issue
that can be reproduced by configuring qt with custom namespace.
Change-Id: I40340ab1df5e2cc3dd67797a74cebcb09fbfd539
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/terminal/mainwindow.h | 6 | ||||
| -rw-r--r-- | examples/terminal/settingsdialog.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/examples/terminal/mainwindow.h b/examples/terminal/mainwindow.h index ed85fe2..357b0b5 100644 --- a/examples/terminal/mainwindow.h +++ b/examples/terminal/mainwindow.h @@ -49,15 +49,17 @@ #include <QtSerialPort/QSerialPort> +QT_BEGIN_NAMESPACE + namespace Ui { class MainWindow; } +QT_END_NAMESPACE + class Console; class SettingsDialog; -QT_USE_NAMESPACE - class MainWindow : public QMainWindow { Q_OBJECT diff --git a/examples/terminal/settingsdialog.h b/examples/terminal/settingsdialog.h index b30518a..d9f99f7 100644 --- a/examples/terminal/settingsdialog.h +++ b/examples/terminal/settingsdialog.h @@ -48,12 +48,16 @@ QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE + namespace Ui { class SettingsDialog; } class QIntValidator; +QT_END_NAMESPACE + class SettingsDialog : public QDialog { Q_OBJECT |