Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

3 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/tools/qmake/testcompiler.cpp b/tests/auto/tools/qmake/testcompiler.cpp
index 4e5dc26eac..3b77b1ec63 100644
--- a/tests/auto/tools/qmake/testcompiler.cpp
+++ b/tests/auto/tools/qmake/testcompiler.cpp
@@ -128,7 +128,7 @@ TestCompiler::~TestCompiler()
 
 bool TestCompiler::errorOut()
 {
-    qDebug(qPrintable(testOutput_.join("\n")));
+    qDebug("%s", qPrintable(testOutput_.join(QStringLiteral("\n"))));
     return false;
 }
 
diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui b/tests/auto/tools/uic/baseline/tabbedbrowser.ui
index 7164fb7271..382f49fe5e 100644
--- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui
+++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui
@@ -99,7 +99,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset resource="assistant.qrc" >:/trolltech/assistant/images/close.png</iconset>
+         <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/close.png</iconset>
         </property>
         <property name="autoRaise" >
          <bool>true</bool>
@@ -130,7 +130,7 @@
          <string>Previous</string>
         </property>
         <property name="icon" >
-         <iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/previous.png</iconset>
+         <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/win/previous.png</iconset>
         </property>
         <property name="toolButtonStyle" >
          <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -152,7 +152,7 @@
          <string>Next</string>
         </property>
         <property name="icon" >
-         <iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/next.png</iconset>
+         <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/win/next.png</iconset>
         </property>
         <property name="toolButtonStyle" >
          <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -194,7 +194,7 @@
          </size>
         </property>
         <property name="text" >
-         <string>&lt;img src=":/trolltech/assistant/images/wrap.png">&amp;nbsp;Search wrapped</string>
+         <string>&lt;img src=":/qt-project.org/assistant/images/wrap.png">&amp;nbsp;Search wrapped</string>
         </property>
         <property name="textFormat" >
          <enum>Qt::RichText</enum>
diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
index 1e99c41312..f2c1f1e3e5 100644
--- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
@@ -125,7 +125,7 @@ public:
         hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
         toolClose = new QToolButton(frameFind);
         toolClose->setObjectName(QStringLiteral("toolClose"));
-        const QIcon icon = QIcon(QString::fromUtf8(":/trolltech/assistant/images/close.png"));
+        const QIcon icon = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/close.png"));
         toolClose->setIcon(icon);
         toolClose->setAutoRaise(true);
 
@@ -144,7 +144,7 @@ public:
 
         toolPrevious = new QToolButton(frameFind);
         toolPrevious->setObjectName(QStringLiteral("toolPrevious"));
-        const QIcon icon1 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/previous.png"));
+        const QIcon icon1 = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/win/previous.png"));
         toolPrevious->setIcon(icon1);
         toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         toolPrevious->setAutoRaise(true);
@@ -154,7 +154,7 @@ public:
         toolNext = new QToolButton(frameFind);
         toolNext->setObjectName(QStringLiteral("toolNext"));
         toolNext->setMinimumSize(QSize(0, 0));
-        const QIcon icon2 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/next.png"));
+        const QIcon icon2 = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/win/next.png"));
         toolNext->setIcon(icon2);
         toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         toolNext->setAutoRaise(true);
@@ -204,7 +204,7 @@ public:
         toolNext->setText(QApplication::translate("TabbedBrowser", "Next", 0, QApplication::UnicodeUTF8));
         checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", 0, QApplication::UnicodeUTF8));
         checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", 0, QApplication::UnicodeUTF8));
-        labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/trolltech/assistant/images/wrap.png\">&nbsp;Search wrapped", 0, QApplication::UnicodeUTF8));
+        labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/qt-project.org/assistant/images/wrap.png\">&nbsp;Search wrapped", 0, QApplication::UnicodeUTF8));
     } // retranslateUi
 
 };