summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-02-15 23:47:16 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-02-16 22:57:14 (GMT)
commitb7406af04ec83b3e8d712b42a87f6c29121b998d (patch)
tree896336e101d1408942bdb2e2919911482ecee7fc /tests
parent757779ae3d27c260214f88411de81e1c32a688b5 (diff)
downloadQt-b7406af04ec83b3e8d712b42a87f6c29121b998d.zip
Qt-b7406af04ec83b3e8d712b42a87f6c29121b998d.tar.gz
Qt-b7406af04ec83b3e8d712b42a87f6c29121b998d.tar.bz2
Fixed compile of these tests when Qt is configured with -qtnamespace
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/modeltest/dynamictreemodel.h2
-rw-r--r--tests/auto/qpixmapcache/tst_qpixmapcache.cpp2
-rw-r--r--tests/auto/qtextstream/tst_qtextstream.cpp7
-rw-r--r--tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h2
-rw-r--r--tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h2
5 files changed, 12 insertions, 3 deletions
diff --git a/tests/auto/modeltest/dynamictreemodel.h b/tests/auto/modeltest/dynamictreemodel.h
index 3f0d90d..9633755 100644
--- a/tests/auto/modeltest/dynamictreemodel.h
+++ b/tests/auto/modeltest/dynamictreemodel.h
@@ -48,8 +48,6 @@
#include <QtCore/QList>
-template<typename T> class QList;
-
class DynamicTreeModel : public QAbstractItemModel
{
Q_OBJECT
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
index a0f4339..f8951f5 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
@@ -483,7 +483,9 @@ void tst_QPixmapCache::pixmapKey()
QVERIFY(!getPrivate(key8));
}
+QT_BEGIN_NAMESPACE
extern int q_QPixmapCache_keyHashSize();
+QT_END_NAMESPACE
void tst_QPixmapCache::noLeak()
{
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp
index 8ff6bee..9146be2 100644
--- a/tests/auto/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp
@@ -4308,10 +4308,15 @@ void tst_QTextStream::int_write_with_locale()
// ------------------------------------------------------------------------------
// like QTEST_APPLESS_MAIN, but initialising the locale on Unix
+#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN)
+QT_BEGIN_NAMESPACE
+extern bool qt_locale_initialized;
+QT_END_NAMESPACE
+#endif
+
int main(int argc, char *argv[])
{
#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN)
- extern bool qt_locale_initialized;
::setlocale(LC_ALL, "");
qt_locale_initialized = true;
#endif
diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h b/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h
index 8cfa143..947687a 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h
+++ b/tests/auto/xmlpatternsxqts/lib/XSDTSTestCase.h
@@ -50,6 +50,7 @@
#include "TestCase.h"
QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
namespace QPatternistSDK
{
@@ -153,6 +154,7 @@ namespace QPatternistSDK
};
}
+QT_END_NAMESPACE
QT_END_HEADER
#endif
diff --git a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h b/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h
index 9179a2d..5493c7d 100644
--- a/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h
+++ b/tests/auto/xmlpatternsxqts/lib/XSDTestSuiteHandler.h
@@ -50,6 +50,7 @@
#include "XQTSTestCase.h"
QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
namespace QPatternistSDK
{
@@ -113,6 +114,7 @@ namespace QPatternistSDK
};
}
+QT_END_NAMESPACE
QT_END_HEADER
#endif