diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:31 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:31 (GMT) |
| commit | 7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb (patch) | |
| tree | b4741e78769d8af5eb97e0ce7337bb89db9e0ef1 /src/corelib | |
| parent | 68778d0d5c0eb9d85ac09e424bfabdd6ccce3b83 (diff) | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
| download | Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.zip Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.tar.gz Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.tar.bz2 | |
Merge remote branch 'origin/4.7' into master-from-4.7
Diffstat (limited to 'src/corelib')
| -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 eeb142b..1b8d8fe 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 |