diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 23:28:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 23:28:55 (GMT) |
| commit | e2c45cbacaa0f48e1397572d3e5baa847c86e9b1 (patch) | |
| tree | 25842df9ab9b23b23a8c2dc2f74eac1abf84ab17 | |
| parent | 7468727b7bf5728502c2928c71185a67bbd6de0b (diff) | |
| parent | c2d539bbb25220105ee79de6d0d59e686508d765 (diff) | |
| download | Qt-e2c45cbacaa0f48e1397572d3e5baa847c86e9b1.zip Qt-e2c45cbacaa0f48e1397572d3e5baa847c86e9b1.tar.gz Qt-e2c45cbacaa0f48e1397572d3e5baa847c86e9b1.tar.bz2 | |
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.
| -rw-r--r-- | src/corelib/plugin/qsystemlibrary.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/plugin/qsystemlibrary_p.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp index a11ed50..43de946 100644 --- a/src/corelib/plugin/qsystemlibrary.cpp +++ b/src/corelib/plugin/qsystemlibrary.cpp @@ -77,6 +77,9 @@ in the documentation for LoadLibrary for Windows CE at MSDN. (http://msdn.microsoft.com/en-us/library/ms886736.aspx) */ + +QT_BEGIN_NAMESPACE + #if defined(Q_OS_WINCE) HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/) { @@ -134,3 +137,5 @@ HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirect } #endif //Q_OS_WINCE + +QT_END_NAMESPACE diff --git a/src/corelib/plugin/qsystemlibrary_p.h b/src/corelib/plugin/qsystemlibrary_p.h index 3251a3c..8000a61 100644 --- a/src/corelib/plugin/qsystemlibrary_p.h +++ b/src/corelib/plugin/qsystemlibrary_p.h @@ -47,6 +47,8 @@ #include <qt_windows.h> #include <QtCore/qstring.h> +QT_BEGIN_NAMESPACE + class QSystemLibrary { public: @@ -101,6 +103,8 @@ private: bool m_didLoad; }; +QT_END_NAMESPACE + #endif //Q_OS_WIN #endif //QSYSTEMLIBRARY_P_H |