From 91d98321d361b4304265e09dba227df9fdc78393 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2018 20:20:56 +0100 Subject: 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 --- qmake/generators/win32/registry_p.h | 4 ++-- 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 #ifdef Q_OS_WIN32 @@ -52,6 +50,8 @@ QT_BEGIN_NAMESPACE #include +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 #include -QT_BEGIN_NAMESPACE //#include //#include "option.h" +QT_BEGIN_NAMESPACE QT_END_NAMESPACE #endif -- cgit v1.2.3