diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
| commit | 4545c81e570c477ae8821531dcfd593e09f950b0 (patch) | |
| tree | f756738ffaf55210a2aa1596407eeed94e504ae7 /src/shared | |
| parent | d0839bc1de52acd0902364565b6f9d030e591646 (diff) | |
| parent | 75e408584ac9a60c3a4dd714f5620814485fcdca (diff) | |
| download | qt-creator-4545c81e570c477ae8821531dcfd593e09f950b0.tar.gz | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
doc/src/howto/creator-sidebar-views.qdoc
doc/src/howto/creator-ui.qdoc
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/autotest/testresultmodel.cpp
src/plugins/autotest/testresultmodel.h
Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/registry_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/shared/proparser/registry_p.h b/src/shared/proparser/registry_p.h index 8defcbae95..1267bc04c5 100644 --- a/src/shared/proparser/registry_p.h +++ b/src/shared/proparser/registry_p.h @@ -35,6 +35,8 @@ #include <QtCore/qstring.h> +QT_BEGIN_NAMESPACE + namespace QMakeInternal { /** @@ -53,3 +55,5 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned long options = 0); } // namespace QMakeInternal + +QT_END_NAMESPACE |