diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-14 20:20:56 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-19 19:21:35 +0000 |
| commit | 91d98321d361b4304265e09dba227df9fdc78393 (patch) | |
| tree | 6fcf10541613e93cf4bea2f626900159e77885b1 /qmake | |
| parent | 1387f1910bde3743dc181bac9d92e86fb64691ef (diff) | |
qmake: move QT_BEGIN_NAMESPACE to correct place
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/registry_p.h | 4 | ||||
| -rw-r--r-- | qmake/qmake_pch.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/win32/registry_p.h b/qmake/generators/win32/registry_p.h index 3526dffd45..f9e8bba016 100644 --- a/qmake/generators/win32/registry_p.h +++ b/qmake/generators/win32/registry_p.h @@ -40,8 +40,6 @@ // We mean it. // -QT_BEGIN_NAMESPACE - #include <QtCore/qglobal.h> #ifdef Q_OS_WIN32 @@ -52,6 +50,8 @@ QT_BEGIN_NAMESPACE #include <QtCore/qstring.h> +QT_BEGIN_NAMESPACE + /** * Read a value from the Windows registry. * diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h index c0f62b263d..c97c872311 100644 --- a/qmake/qmake_pch.h +++ b/qmake/qmake_pch.h @@ -54,10 +54,10 @@ #include <stdlib.h> #include <qregexp.h> -QT_BEGIN_NAMESPACE //#include <qdir.h> //#include "option.h" +QT_BEGIN_NAMESPACE QT_END_NAMESPACE #endif |