Skip to content

Commit e2c45cb

Browse files
author
Qt Continuous Integration System
committed
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Build fix for -qtnamespace.
2 parents 7468727 + c2d539b commit e2c45cb

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/corelib/plugin/qsystemlibrary.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@
7777
in the documentation for LoadLibrary for Windows CE at MSDN.
7878
(http://msdn.microsoft.com/en-us/library/ms886736.aspx)
7979
*/
80+
81+
QT_BEGIN_NAMESPACE
82+
8083
#if defined(Q_OS_WINCE)
8184
HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/)
8285
{
@@ -134,3 +137,5 @@ HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirect
134137
}
135138

136139
#endif //Q_OS_WINCE
140+
141+
QT_END_NAMESPACE

src/corelib/plugin/qsystemlibrary_p.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
#include <qt_windows.h>
4848
#include <QtCore/qstring.h>
4949

50+
QT_BEGIN_NAMESPACE
51+
5052
class QSystemLibrary
5153
{
5254
public:
@@ -101,6 +103,8 @@ class QSystemLibrary
101103
bool m_didLoad;
102104
};
103105

106+
QT_END_NAMESPACE
107+
104108
#endif //Q_OS_WIN
105109

106110
#endif //QSYSTEMLIBRARY_P_H

0 commit comments

Comments
 (0)