Rebase ontop of current master

1 files changed, 361 insertions, 611 deletions

diff --git a/patches/0102-Modularized-tst_compilerwarnings.patch b/patches/0102-Modularized-tst_compilerwarnings.patch
index 1d112f6..0dc3339 100644
--- a/patches/0102-Modularized-tst_compilerwarnings.patch
+++ b/patches/0102-Modularized-tst_compilerwarnings.patch
@@ -1,284 +1,195 @@
-From 47882f66a801e269aa1cb3d809dbd7490b7b00e6 Mon Sep 17 00:00:00 2001
+From 9b7afe35269228d7ac48f92b98a576a8d2303080 Mon Sep 17 00:00:00 2001
 From: Liang Qi <liang.qi@nokia.com>
 Date: Wed, 23 Mar 2011 17:25:22 +0100
 Subject: [PATCH] Modularized tst_compilerwarnings
 
 ---
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   52 +++++++++++++++
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   52 +++++++++++++++
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   69 +++++++++++++++++++
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   52 +++++++++++++++
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   22 +-------
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   22 +-------
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |    9 ++--
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   22 +-------
  .../auto/compilerwarnings/compilerwarnings.pro     |    2 +-
  .../auto/compilerwarnings/compilerwarnings.qrc     |    5 --
- qtqa/tests/auto/compilerwarnings/test_cpp.txt      |   70 --------------------
- .../auto/compilerwarnings/tst_compilerwarnings.cpp |   57 +++++++++++++---
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   51 ++++++++++++++
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   56 ++++++++++++++++
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   52 +++++++++++++++
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   52 +++++++++++++++
- .../tests/auto/compilerwarnings/data/test_cpp.txt  |   52 +++++++++++++++
- 13 files changed, 535 insertions(+), 87 deletions(-)
- create mode 100644 phonon/tests/auto/compilerwarnings/data/test_cpp.txt
- create mode 100644 qt3support/tests/auto/compilerwarnings/data/test_cpp.txt
- create mode 100644 qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt
- create mode 100644 qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt
+ .../auto/compilerwarnings/tst_compilerwarnings.cpp |   57 ++++++++++++++++----
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   23 +-------
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   22 ++------
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   22 +-------
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   22 +-------
+ .../tests/auto/compilerwarnings/data}/test_cpp.txt |   22 +-------
+ 12 files changed, 69 insertions(+), 181 deletions(-)
+ copy {qtqa/tests/auto/compilerwarnings => phonon/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
+ copy {qtqa/tests/auto/compilerwarnings => qt3support/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
+ copy {qtqa/tests/auto/compilerwarnings => qtkernel/tests/auto/compilerwarnings/data}/test_cpp.txt (96%)
+ copy {qtqa/tests/auto/compilerwarnings => qtmultimedia/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
  delete mode 100644 qtqa/tests/auto/compilerwarnings/compilerwarnings.qrc
- delete mode 100644 qtqa/tests/auto/compilerwarnings/test_cpp.txt
- create mode 100644 qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
- create mode 100644 qtscript/tests/auto/compilerwarnings/data/test_cpp.txt
- create mode 100644 qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt
- create mode 100644 qttools/tests/auto/compilerwarnings/data/test_cpp.txt
- create mode 100644 qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt
+ copy {qtqa/tests/auto/compilerwarnings => qtquick/tests/auto/compilerwarnings/data}/test_cpp.txt (83%)
+ copy {qtqa/tests/auto/compilerwarnings => qtscript/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
+ copy {qtqa/tests/auto/compilerwarnings => qtsvg/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
+ copy {qtqa/tests/auto/compilerwarnings => qttools/tests/auto/compilerwarnings/data}/test_cpp.txt (82%)
+ rename {qtqa/tests/auto/compilerwarnings => qtxmlpatterns/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
 
-diff --git a/phonon/tests/auto/compilerwarnings/data/test_cpp.txt b/phonon/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..775619a
---- /dev/null
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/phonon/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 81%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to phonon/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..775619a 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/phonon/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,52 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
+@@ -40,31 +40,13 @@
+ ****************************************************************************/
+ 
+ 
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
+-#endif
+-
+-#include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
 +#ifndef QT_NO_PHONON
 +#include <phonon/phonon>
-+#endif
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
-diff --git a/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt b/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..1c52f27
---- /dev/null
+ #endif
+ 
+-#include <QtDeclarative/QtDeclarative>
+-
+-
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+ {
+     return 0;
+ }
+ #endif
+-
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 81%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to qt3support/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..1c52f27 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,52 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
+@@ -40,31 +40,13 @@
+ ****************************************************************************/
+ 
+ 
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
+-#endif
+-
+-#include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
 +#ifdef QT3_SUPPORT
 +#include <Qt3Support/Qt3Support>
-+#endif
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
-diff --git a/qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt b/qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..9b8d11c
---- /dev/null
+ #endif
+ 
+-#include <QtDeclarative/QtDeclarative>
+-
+-
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+ {
+     return 0;
+ }
+ #endif
+-
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 96%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..9b8d11c 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qtkernel/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,69 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
-+#include <QtCore/QtCore>
-+#include <QtNetwork/QtNetwork>
-+#include <QtXml/QtXml>
-+#include <QtSql/QtSql>
+@@ -44,22 +44,22 @@
+ #include <QtNetwork/QtNetwork>
+ #include <QtXml/QtXml>
+ #include <QtSql/QtSql>
 +
 +#ifndef QT_NO_GUI
-+#include <QtGui/QtGui>
+ #include <QtGui/QtGui>
 +#endif
-+
-+#ifndef QT_NO_OPENGL
-+#include <QtOpenGL/QtOpenGL>
-+#endif
-+
-+#include <QtTest/QtTest>
-+
-+#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
-+#include <QtDBus/QtDBus>
-+#endif
-+
+ 
+ #ifndef QT_NO_OPENGL
+ #include <QtOpenGL/QtOpenGL>
+ #endif
+ 
+-#include <QtDesigner/QtDesigner>
+-
+ #include <QtTest/QtTest>
+ 
+ #if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+ #include <QtDBus/QtDBus>
+ #endif
+ 
+-#include <QtDeclarative/QtDeclarative>
+-
 +#include <QtUiTools/QtUiTools>
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
-diff --git a/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt b/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..3e33574
---- /dev/null
+ 
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+@@ -67,4 +67,3 @@ int main(int, char **)
+     return 0;
+ }
+ #endif
+-
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 81%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..3e33574 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,52 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
+@@ -40,31 +40,13 @@
+ ****************************************************************************/
+ 
+ 
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
+-#endif
+-
+-#include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
 +#ifndef QT_NO_MULTIMEDIA
 +#include <QtMultimedia/QtMultimedia>
-+#endif
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
+ #endif
+ 
+-#include <QtDeclarative/QtDeclarative>
+-
+-
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+ {
+     return 0;
+ }
+ #endif
+-
 diff --git a/qtqa/tests/auto/compilerwarnings/compilerwarnings.pro b/qtqa/tests/auto/compilerwarnings/compilerwarnings.pro
 index beb0279..301834c 100644
 --- a/qtqa/tests/auto/compilerwarnings/compilerwarnings.pro
@@ -300,82 +211,6 @@ index 3fa313c..0000000
 -     <file>test_cpp.txt</file>
 - </qresource>
 - </RCC>
-diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtqa/tests/auto/compilerwarnings/test_cpp.txt
-deleted file mode 100644
-index d27e972..0000000
---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
-+++ /dev/null
-@@ -1,70 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
--** All rights reserved.
--** Contact: Nokia Corporation (qt-info@nokia.com)
--**
--** This file is part of the test suite 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$
--**
--****************************************************************************/
--
--
--#include <QtCore/QtCore>
--#include <QtNetwork/QtNetwork>
--#include <QtXml/QtXml>
--#include <QtSql/QtSql>
--#include <QtGui/QtGui>
--
--#ifndef QT_NO_OPENGL
--#include <QtOpenGL/QtOpenGL>
--#endif
--
--#include <QtDesigner/QtDesigner>
--
--#include <QtTest/QtTest>
--
--#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
--#include <QtDBus/QtDBus>
--#endif
--
--#include <QtDeclarative/QtDeclarative>
--
--
--#ifndef Q_OS_MAC
--int main(int, char **)
--{
--    return 0;
--}
--#endif
--
 diff --git a/qtqa/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/qtqa/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
 index b518e20..d33ad6e 100644
 --- a/qtqa/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
@@ -529,299 +364,214 @@ index b518e20..d33ad6e 100644
           << "-c"
           << "-woff" << "3303" // const qualifier on return
           << "-o" << tmpFile
-diff --git a/qtquick/tests/auto/compilerwarnings/data/test_cpp.txt b/qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..a3d65db
---- /dev/null
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 83%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..a3d65db 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,51 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
+@@ -39,27 +39,9 @@
+ **
+ ****************************************************************************/
+ 
+-
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
+-#endif
+-
+-#include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
+-#endif
+-
 +#ifndef QT_NO_DECLARATIVE
-+#include <QtDeclarative/QtDeclarative>
-+#endif
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
+ #include <QtDeclarative/QtDeclarative>
+-
 +#endif
-diff --git a/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt b/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..c5c5933
---- /dev/null
+ 
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+@@ -67,4 +49,3 @@ int main(int, char **)
+     return 0;
+ }
+ #endif
+-
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 81%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to qtscript/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..c5c5933 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,56 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
+@@ -40,31 +40,17 @@
+ ****************************************************************************/
+ 
+ 
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
 +#ifndef QT_NO_SCRIPT
 +#include <QtScript/QtScript>
-+#endif
-+
+ #endif
+ 
+-#include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
 +#ifndef QT_NO_SCRIPTTOOLS
 +#include <QtScriptTools/QtScriptTools>
-+#endif
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
-diff --git a/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt b/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..4ac69de
---- /dev/null
+ #endif
+ 
+-#include <QtDeclarative/QtDeclarative>
+-
+-
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+ {
+     return 0;
+ }
+ #endif
+-
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 81%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..4ac69de 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,52 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
+@@ -40,31 +40,13 @@
+ ****************************************************************************/
+ 
+ 
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
+-#endif
+-
+-#include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
 +#ifndef QT_NO_SVG
 +#include <QtSvg/QtSvg>
-+#endif
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
-diff --git a/qttools/tests/auto/compilerwarnings/data/test_cpp.txt b/qttools/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..5e0cbf3
---- /dev/null
+ #endif
+ 
+-#include <QtDeclarative/QtDeclarative>
+-
+-
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+ {
+     return 0;
+ }
+ #endif
+-
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qttools/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 82%
+copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+copy to qttools/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..5e0cbf3 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qttools/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,52 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
-+#include <QtDesigner/QtDesigner>
+@@ -40,26 +40,9 @@
+ ****************************************************************************/
+ 
+ 
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
+-#endif
+-
+ #include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
+-#endif
+-
+-#include <QtDeclarative/QtDeclarative>
+-
 +#include <QtHelp/QtHelp>
 +//#include <QtCLucene/QtCLucene>
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
-diff --git a/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt b/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt
-new file mode 100644
-index 0000000..77fa9ba
---- /dev/null
+ 
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+@@ -67,4 +50,3 @@ int main(int, char **)
+     return 0;
+ }
+ #endif
+-
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt
+similarity index 81%
+rename from qtqa/tests/auto/compilerwarnings/test_cpp.txt
+rename to qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt
+index d27e972..77fa9ba 100644
+--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
 +++ b/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt
-@@ -0,0 +1,52 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite 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$
-+**
-+****************************************************************************/
-+
-+
+@@ -40,31 +40,13 @@
+ ****************************************************************************/
+ 
+ 
+-#include <QtCore/QtCore>
+-#include <QtNetwork/QtNetwork>
+-#include <QtXml/QtXml>
+-#include <QtSql/QtSql>
+-#include <QtGui/QtGui>
+-
+-#ifndef QT_NO_OPENGL
+-#include <QtOpenGL/QtOpenGL>
+-#endif
+-
+-#include <QtDesigner/QtDesigner>
+-
+-#include <QtTest/QtTest>
+-
+-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+-#include <QtDBus/QtDBus>
 +#ifndef QT_NO_XMLPATTERNS
 +#include <QtXmlPatterns/QtXmlPatterns>
-+#endif
-+
-+#ifndef Q_OS_MAC
-+int main(int, char **)
-+{
-+    return 0;
-+}
-+#endif
+ #endif
+ 
+-#include <QtDeclarative/QtDeclarative>
+-
+-
+ #ifndef Q_OS_MAC
+ int main(int, char **)
+ {
+     return 0;
+ }
+ #endif
+-
 -- 
-1.7.4.1.48.g5673d
+1.7.3.2.343.g7d43d