Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/xmlpatterns/api/qcoloroutput_p.h
	src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
	sync.profile

Change-Id: Ibf1d2ab42c4316d9fada397b1f1c0f37e65662dd

4 files changed, 6 insertions, 68 deletions

diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro
index a4a3a95..29bd8ee 100644
--- a/tests/auto/checkxmlfiles/checkxmlfiles.pro
+++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro
@@ -8,12 +8,13 @@ include (../xmlpatterns.pri)
 
 wince*: {
 QT += network
+requires(!isEmpty(_QMAKE_SUPER_CACHE_))
 addFiles.files = \
-	$$QT.sql.sources/../../examples/sql/masterdetail/albumdetails.xml \
 	../../../examples/xquery/globalVariables/globals.gccxml \
 	../../../../qtdoc/doc/src/diagrams/stylesheet/treeview.svg \
 	../../../../qtdoc/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui \
-	$$QT.widgets.sources/../../examples/tools/undo/undo.qrc
+	../../../../qtsql/examples/sql/masterdetail/albumdetails.xml \
+	../../../../qtbase/examples/widgets/tools/undo/undo.qrc
 addFiles.path = xmlfiles
 DEPLOYMENT += addFiles
 } else {
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 534f8aa..ecf5f1f 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -1,5 +1,3 @@
-TARGET = tst_headersclean
-CONFIG += testcase
-SOURCES  += tst_headersclean.cpp
-QT = core xmlpatterns testlib
+QT = xmlpatterns
+load(qt_headersclean)
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp
deleted file mode 100644
index 684f5fc..0000000
--- a/tests/auto/headersclean/tst_headersclean.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** 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, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#define QT_NO_KEYWORDS
-#define signals int
-#define slots int
-#define emit public:;
-#define foreach public:;
-#define forever public:;
-
-#include <QtCore/QtCore>
-#include <QtTest/QtTest>
-
-#include <QtXmlPatterns/QtXmlPatterns>
-
-class tst_HeadersClean: public QObject
-{
-    Q_OBJECT
-public:
-    tst_HeadersClean() {}
-};
-
-QTEST_MAIN(tst_HeadersClean)
-#include "tst_headersclean.moc"
diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri
index ea939f1..96d8261 100644
--- a/tests/auto/xmlpatterns.pri
+++ b/tests/auto/xmlpatterns.pri
@@ -9,6 +9,7 @@ wince*: {
     QT += network
 }
 QT -= gui
+QMAKE_RPATHLINKDIR *= $$QT.gui.libs
 
 XMLPATTERNS_SDK = QtXmlPatternsSDK
 if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {