Fix compile with namespace'ed Qt.

Change-Id: I9c0d399943d2f6eb9a0ab136abf24a5c8b108abb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Karsten Heimrich 2016-01-21 12:51:37 +01:00
parent 5abd497a56
commit 22a0f6b682
3 changed files with 4 additions and 10 deletions

View File

@ -35,7 +35,9 @@
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE
class QNetworkProxy; class QNetworkProxy;
QT_END_NAMESPACE
namespace QInstaller { namespace QInstaller {

View File

@ -12,15 +12,6 @@
using namespace QInstaller; 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 class tst_MessageBoxHandler : public QObject
{ {
Q_OBJECT Q_OBJECT

View File

@ -42,10 +42,11 @@
#include <QMainWindow> #include <QMainWindow>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;
} }
QT_END_NAMESPACE
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {