Skip to content

Commit

Permalink
qmake: move QT_BEGIN_NAMESPACE to correct place
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ossilator committed Dec 19, 2018
1 parent 1387f19 commit 91d9832
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions qmake/generators/win32/registry_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
// We mean it.
//

QT_BEGIN_NAMESPACE

#include <QtCore/qglobal.h>

#ifdef Q_OS_WIN32
Expand All @@ -52,6 +50,8 @@ QT_BEGIN_NAMESPACE

#include <QtCore/qstring.h>

QT_BEGIN_NAMESPACE

/**
* Read a value from the Windows registry.
*
Expand Down
2 changes: 1 addition & 1 deletion qmake/qmake_pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 91d9832

Please sign in to comment.