diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-23 15:01:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 12:18:37 +0200 |
| commit | dea76f3496ee077e271b334c7e8101fed5119481 (patch) | |
| tree | 6a8833a12f851391f148ea1aae1fcfd5eaef88b9 /src/platformsupport | |
| parent | cb57d36f4559faf63acdca2cfb7b35431b959164 (diff) | |
Make qtbase build with Qt-in-namespace again
Change-Id: I5faa8690a05d6ec352fc69c0b69848539f2ed216
Reviewed-on: http://codereview.qt-project.org/5460
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp | 5 | ||||
| -rw-r--r-- | src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h | 22 |
2 files changed, 26 insertions, 1 deletions
diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp index 12981c5721..ba783c547a 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp @@ -42,7 +42,8 @@ #include "qgenericunixeventdispatcher_p.h" #include "qeventdispatcher_qpa_p.h" #include "qeventdispatcher_glib_p.h" -#include <qglobal.h> + +QT_BEGIN_NAMESPACE class QAbstractEventDispatcher *createUnixEventDispatcher() { @@ -53,3 +54,5 @@ class QAbstractEventDispatcher *createUnixEventDispatcher() #endif return new QEventDispatcherQPA(); } + +QT_END_NAMESPACE diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h index 0d9f5b7db0..e50f57d9a8 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h @@ -39,5 +39,27 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#ifndef QGENERICUNIXEVENTDISPATCHER_P_H +#define QGENERICUNIXEVENTDISPATCHER_P_H + +#include <qglobal.h> + +QT_BEGIN_NAMESPACE + class QAbstractEventDispatcher; QAbstractEventDispatcher* createUnixEventDispatcher(); + +QT_END_NAMESPACE + +#endif // QGENERICUNIXEVENTDISPATCHER_P_H |