aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-09-28 09:57:04 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-28 11:43:47 +0200
commit85569dfdff1caec2efb714a1a9cdc64094893ec1 (patch)
treea8eff782686b348c8ed0a97730e16156133e80ea /src/imports
parent9a8466839b030a4ffebf74a813737d7cc55aa1d0 (diff)
Build with qt-in-namespace
Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a Reviewed-on: http://codereview.qt-project.org/5693 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/testlib/main.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index c12b9423a9..a6fb992fed 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -48,13 +48,14 @@
#include "private/qtestoptions_p.h"
#include "QtDeclarative/qsgitem.h"
#include <QtDeclarative/private/qdeclarativeengine_p.h>
-QT_BEGIN_NAMESPACE
QML_DECLARE_TYPE(QuickTestResult)
QML_DECLARE_TYPE(QuickTestEvent)
#include <QtDebug>
+QT_BEGIN_NAMESPACE
+
class QuickTestUtil : public QObject
{
Q_OBJECT
@@ -145,8 +146,13 @@ public Q_SLOTS:
return -1;
}
};
+
+QT_END_NAMESPACE
+
QML_DECLARE_TYPE(QuickTestUtil)
+QT_BEGIN_NAMESPACE
+
class QTestQmlModule : public QDeclarativeExtensionPlugin
{
Q_OBJECT