1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: move QT_BEGIN_NAMESPACE to correct place

Browse Source 
this makes no difference whatsoever, because qmake isn't actually built
in a namespace, but it makes the new qtc code model happy.

Change-Id: I70ad8e16cceff73276a821219fc80bab365954b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-12-14 20:20:56 +01:00
parent 1387f1910b
commit 91d98321d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/win32/registry_p.h
View File

@ -40,8 +40,6 @@
// We mean it. // We mean it.
// //
QT_BEGIN_NAMESPACE
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
@ -52,6 +50,8 @@ QT_BEGIN_NAMESPACE
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
QT_BEGIN_NAMESPACE
/** /**
* Read a value from the Windows registry. * Read a value from the Windows registry.
* *

2
qmake/qmake_pch.h
View File

@ -54,10 +54,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <qregexp.h> #include <qregexp.h>
QT_BEGIN_NAMESPACE
//#include <qdir.h> //#include <qdir.h>
//#include "option.h" //#include "option.h"
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif