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/widgets/kernel | |
| 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/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qdesktopwidget_qpa_p.h | 4 | ||||
| -rw-r--r-- | src/widgets/kernel/qplatformmenu_qpa.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/kernel/qdesktopwidget_qpa_p.h b/src/widgets/kernel/qdesktopwidget_qpa_p.h index ddae7f3853..01ba44875d 100644 --- a/src/widgets/kernel/qdesktopwidget_qpa_p.h +++ b/src/widgets/kernel/qdesktopwidget_qpa_p.h @@ -56,6 +56,8 @@ #include "QDesktopWidget" #include "private/qwidget_p.h" +QT_BEGIN_NAMESPACE + class QDesktopScreenWidget : public QWidget { Q_OBJECT public: @@ -78,4 +80,6 @@ public: QList<QDesktopScreenWidget *> screens; }; +QT_END_NAMESPACE + #endif // QDESKTOPWIDGET_QPA_P_H diff --git a/src/widgets/kernel/qplatformmenu_qpa.cpp b/src/widgets/kernel/qplatformmenu_qpa.cpp index 4921f91006..fd5cc78bf0 100644 --- a/src/widgets/kernel/qplatformmenu_qpa.cpp +++ b/src/widgets/kernel/qplatformmenu_qpa.cpp @@ -41,6 +41,8 @@ #include "qplatformmenu_qpa.h" +QT_BEGIN_NAMESPACE + // // QPlatformMenuAction // @@ -90,3 +92,4 @@ void QPlatformMenuBar::handleReparent(QWidget *newParent) Q_UNUSED(newParent); } +QT_END_NAMESPACE |