diff options
| author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-09-07 11:36:25 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@theqtcompany.com> | 2015-09-07 10:41:58 +0000 |
| commit | d3de2b14cbd02e85aa711051a2d6c8d1d18d65ba (patch) | |
| tree | d50a4badf7433718109310571fb918f2f7d7a52f | |
| parent | cab3405ad2b0d269924a93263298304bff8807eb (diff) | |
Compile with namespaces.
Change-Id: I734b0e27d53fd8b6199a3fb5891497df0e1815bb
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
| -rw-r--r-- | src/libs/installer/proxycredentialsdialog.h | 2 | ||||
| -rw-r--r-- | tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp | 2 | ||||
| -rw-r--r-- | tools/repocompare/mainwindow.h | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/installer/proxycredentialsdialog.h b/src/libs/installer/proxycredentialsdialog.h index 1a28fd1a2..f7124f07b 100644 --- a/src/libs/installer/proxycredentialsdialog.h +++ b/src/libs/installer/proxycredentialsdialog.h @@ -36,7 +36,7 @@ #include <QDialog> -class QNetworkProxy; +QT_FORWARD_DECLARE_CLASS(QNetworkProxy) namespace QInstaller { diff --git a/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp b/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp index 9515848aa..dd127f626 100644 --- a/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp +++ b/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp @@ -12,6 +12,7 @@ using namespace QInstaller; +QT_BEGIN_NAMESPACE namespace QTest { template<> char *toString(const QMessageBox::StandardButton &button) @@ -20,6 +21,7 @@ namespace QTest { return qstrdup(buttonAsString.toLatin1().data()); } } +QT_END_NAMESPACE class tst_MessageBoxHandler : public QObject { diff --git a/tools/repocompare/mainwindow.h b/tools/repocompare/mainwindow.h index 827c02298..7d87a399a 100644 --- a/tools/repocompare/mainwindow.h +++ b/tools/repocompare/mainwindow.h @@ -43,10 +43,11 @@ #include <QMainWindow> #include <QNetworkAccessManager> +QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } - +QT_END_NAMESPACE class MainWindow : public QMainWindow { |