Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace
  Fixed compile of these tests when Qt is configured with -qtnamespace
  Check in sample license headers

12 files changed, 127 insertions, 3 deletions

diff --git a/header.BSD b/header.BSD
new file mode 100644
index 0000000..3c0d604
--- /dev/null
+++ b/header.BSD
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the FOO module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/header.LGPL b/header.LGPL
new file mode 100644
index 0000000..4fbd874
--- /dev/null
+++ b/header.LGPL
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the FOO module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
diff --git a/header.LGPL-ONLY b/header.LGPL-ONLY
new file mode 100644
index 0000000..59b4c04
--- /dev/null
+++ b/header.LGPL-ONLY
@@ -0,0 +1,22 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the FOO module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-ONLY$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
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/qlocalsocket/lackey/main.cpp b/tests/auto/qlocalsocket/lackey/main.cpp
index 0f1930c..1bba4f8 100644
--- a/tests/auto/qlocalsocket/lackey/main.cpp
+++ b/tests/auto/qlocalsocket/lackey/main.cpp
@@ -172,8 +172,10 @@ static int _q_ScriptRegisterQObjectMetaType(QScriptEngine *engine, const QScript
     return qScriptRegisterMetaType<T*>(engine, _q_ScriptValueFromQObject<T>, _q_ScriptValueToQObject<T>, prototype);
 }
 
+QT_BEGIN_NAMESPACE
 Q_SCRIPT_DECLARE_QMETAOBJECT(QScriptLocalSocket, QObject*);
 Q_SCRIPT_DECLARE_QMETAOBJECT(QScriptLocalServer, QObject*);
+QT_END_NAMESPACE
 
 static void interactive(QScriptEngine &eng)
 {
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/qpluginloader/theplugin/plugininterface.h b/tests/auto/qpluginloader/theplugin/plugininterface.h
index 0b093db..9b69429 100644
--- a/tests/auto/qpluginloader/theplugin/plugininterface.h
+++ b/tests/auto/qpluginloader/theplugin/plugininterface.h
@@ -45,7 +45,10 @@ struct PluginInterface {
     virtual ~PluginInterface() {}
     virtual QString pluginName() const = 0;
 };
+
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(PluginInterface, "com.trolltect.autotests.plugininterface/1.0")
+QT_END_NAMESPACE
 
 #endif // PLUGININTERFACE_H
 
diff --git a/tests/auto/qsharedmemory/lackey/main.cpp b/tests/auto/qsharedmemory/lackey/main.cpp
index 5a5bf5e..fef8d22 100644
--- a/tests/auto/qsharedmemory/lackey/main.cpp
+++ b/tests/auto/qsharedmemory/lackey/main.cpp
@@ -242,9 +242,11 @@ private:
     QSharedMemory sm;
 };
 
+QT_BEGIN_NAMESPACE
 Q_SCRIPT_DECLARE_QMETAOBJECT(ScriptSharedMemory, QObject*);
 Q_SCRIPT_DECLARE_QMETAOBJECT(ScriptSystemLock, QObject*);
 Q_SCRIPT_DECLARE_QMETAOBJECT(ScriptSystemSemaphore, QObject*);
+QT_END_NAMESPACE
 
 static void interactive(QScriptEngine &eng)
 {
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/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 21b2fe3..a316dda 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -3200,7 +3200,10 @@ struct MyPrimitive
         return x == o.x && y == o.y;
     }
 };
+
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
+QT_END_NAMESPACE
 
 struct MyData
 {
@@ -3239,7 +3242,9 @@ struct MyMovable
 int MyMovable::count  = 0;
 
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QList<QSize>)
 Q_DECLARE_METATYPE(MyPrimitive)
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