From 22a0f6b682fb8ef74e11f0e7a2ffac7c8f12222b Mon Sep 17 00:00:00 2001
From: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Date: Thu, 21 Jan 2016 12:51:37 +0100
Subject: Fix compile with namespace'ed Qt.

Change-Id: I9c0d399943d2f6eb9a0ab136abf24a5c8b108abb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/libs/installer/proxycredentialsdialog.h                      | 2 ++
 tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp | 9 ---------
 tools/repocompare/mainwindow.h                                   | 3 ++-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/libs/installer/proxycredentialsdialog.h b/src/libs/installer/proxycredentialsdialog.h
index f4935c53d..81b2f7cef 100644
--- a/src/libs/installer/proxycredentialsdialog.h
+++ b/src/libs/installer/proxycredentialsdialog.h
@@ -35,7 +35,9 @@
 
 #include <QDialog>
 
+QT_BEGIN_NAMESPACE
 class QNetworkProxy;
+QT_END_NAMESPACE
 
 namespace QInstaller {
 
diff --git a/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp b/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
index 75df29949..d032b973f 100644
--- a/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
+++ b/tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
@@ -12,15 +12,6 @@
 
 using namespace QInstaller;
 
-namespace QTest {
-    template<>
-    char *toString(const QMessageBox::StandardButton &button)
-    {
-        QString buttonAsString(QString::number(button));
-        return qstrdup(buttonAsString.toLatin1().data());
-    }
-}
-
 class tst_MessageBoxHandler : public QObject
 {
     Q_OBJECT
diff --git a/tools/repocompare/mainwindow.h b/tools/repocompare/mainwindow.h
index ecba780dc..ac155b0bd 100644
--- a/tools/repocompare/mainwindow.h
+++ b/tools/repocompare/mainwindow.h
@@ -42,10 +42,11 @@
 #include <QMainWindow>
 #include <QNetworkAccessManager>
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class MainWindow;
 }
-
+QT_END_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
-- 
cgit v1.2.3