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

Conflicts:
	.qmake.conf
	src/linguist/lupdate/cpp.cpp

Change-Id: Id27ac2ea8438e60a940d4ae3719ad393d7ad88ea

244 files changed, 404 insertions, 141 deletions

diff --git a/tests/auto/linguist/lconvert/lconvert.pro b/tests/auto/linguist/lconvert/lconvert.pro
index f1761e697..60e674ad4 100644
--- a/tests/auto/linguist/lconvert/lconvert.pro
+++ b/tests/auto/linguist/lconvert/lconvert.pro
@@ -6,5 +6,3 @@ TARGET = tst_lconvert
 #HEADERS += testlupdate.h
 SOURCES += tst_lconvert.cpp
 # testlupdate.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lrelease/lrelease.pro b/tests/auto/linguist/lrelease/lrelease.pro
index 7da0e42b8..ba69b7ff3 100644
--- a/tests/auto/linguist/lrelease/lrelease.pro
+++ b/tests/auto/linguist/lrelease/lrelease.pro
@@ -3,4 +3,3 @@ QT = core testlib
 TARGET = tst_lrelease
 
 SOURCES += tst_lrelease.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp
index f53eca36d..3542d2573 100644
--- a/tests/auto/linguist/lrelease/tst_lrelease.cpp
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -141,11 +141,11 @@ void tst_lrelease::translate()
     QCOMPARE(QCoreApplication::translate("", "Test", "Empty context"), QString("AAAA"));
 
     // Test plurals
-    QString txed = QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 0);
+    QString txed = QCoreApplication::translate("Plurals", "There are %n houses", 0, 0);
     QCOMPARE(QString::fromLatin1("[%1]").arg(txed), QString("[There are 0 houses]"));
-    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 1), QString("There is 1 house"));
-    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 2), QString("There are 2 houses"));
-    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 3), QString("There are 3 houses"));
+    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, 1), QString("There is 1 house"));
+    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, 2), QString("There are 2 houses"));
+    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, 3), QString("There are 3 houses"));
 
 
     // More plurals
diff --git a/tests/auto/linguist/lupdate/lupdate.pro b/tests/auto/linguist/lupdate/lupdate.pro
index 35339ef73..cf2b854c4 100644
--- a/tests/auto/linguist/lupdate/lupdate.pro
+++ b/tests/auto/linguist/lupdate/lupdate.pro
@@ -4,5 +4,3 @@ QT += testlib
 TARGET = tst_lupdate
 
 SOURCES += tst_lupdate.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
index 5761863e1..d4dcda880 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
@@ -1,4 +1,3 @@
 SOURCES += src\\main.cpp
 
 TRANSLATIONS = ts\\project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
index 3779ef0e7..489e0607d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
@@ -4,4 +4,3 @@ CONFIG+= console
 TRANSLATIONS = project.ts
 
 CODECFORSRC = utf-8
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro b/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro
index 1997e035d..1815c37dc 100644
--- a/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro
@@ -5,4 +5,3 @@ SOURCES += main.cpp
 HEADERS += main.h
 
 TRANSLATIONS += ../project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
index 7a7ad5ee7..759bea068 100644
--- a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
@@ -1,4 +1,3 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
index 7a7ad5ee7..759bea068 100644
--- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
@@ -1,4 +1,3 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
index b7a9f77e5..614985830 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
@@ -1,4 +1,3 @@
 SOURCES += foo.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
index 9c06a2010..fa56972dd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
@@ -1,4 +1,3 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
index 7a7ad5ee7..759bea068 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
@@ -1,4 +1,3 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
index 78ab97bf9..ae4ac758c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
@@ -65,7 +65,7 @@ void FindDialog::reset()
     tr("%n item(s)", "merge from a finished singular form to an unfinished plural form", 4);
 
 
-
+    //~ meta matter
     //% "Hello"
     qtTrId("xx_hello");
 
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
index 6667df7f4..63f5d66e2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
@@ -1,4 +1,3 @@
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
index 5ef7b23c1..591c95508 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
@@ -6,6 +6,7 @@
         <location filename="finddialog.cpp" line="70"/>
         <source>Hello</source>
         <translation>Hallo</translation>
+        <extra-meta>something really clever</extra-meta>
     </message>
     <message id="xx_world">
         <location filename="finddialog.cpp" line="73"/>
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result
index 49e94ce09..b1000d0aa 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result
@@ -7,6 +7,7 @@
         <location filename="finddialog.cpp" line="70"/>
         <source>Hello</source>
         <translation>Hallo</translation>
+        <extra-meta>matter</extra-meta>
     </message>
     <message id="xx_world">
         <location filename="finddialog.cpp" line="73"/>
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
index 6667df7f4..63f5d66e2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
@@ -1,4 +1,3 @@
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
index 6667df7f4..63f5d66e2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
@@ -1,4 +1,3 @@
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
index 9c06a2010..fa56972dd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
@@ -1,4 +1,3 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
index 9c06a2010..fa56972dd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
@@ -1,4 +1,3 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
index 15f3ad464..cd9a64a1f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/finddialog.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-QT_TRANSLATE_NOOP("context", "just a message")
+QT_TRANSLATE_NOOP("context", "just a message");
 
 
 
 //: This is one comment
-QT_TRANSLATE_NOOP("context", "just a message")
+QT_TRANSLATE_NOOP("context", "just a message");
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
index b501ff22a..b0fd0cbfe 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
@@ -43,11 +43,33 @@
 
 
 //: This is a comment, too.
-QT_TRANSLATE_NOOP("context", "just a message")
+QT_TRANSLATE_NOOP("context", "just a message");
 
 
 
+//: commented
+qtTrId("lollipop");
 
+//% "this is the source text"
+//~ meta so-meta
+//: even more commented
+qtTrId("lollipop");
 
+//% "this is contradicting source text"
+qtTrId("lollipop");
 
+//~ meta too-much-meta
+qtTrId("lollipop");
 
+
+
+//~ meta so-meta
+QObject::tr("another message", "here with a lot of noise in the comment so it is long enough");
+
+//~ meta too-much-meta
+QObject::tr("another message", "here with a lot of noise in the comment so it is long enough");
+
+
+
+//: commented
+qtTrId("lollipop");
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
index 37df00f40..bbabdfba2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
@@ -2,4 +2,3 @@ SOURCES += main.cpp
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
index c11bbf2b4..4554fc9c2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
@@ -2,6 +2,30 @@
 <!DOCTYPE TS>
 <TS version="2.1">
 <context>
+    <name></name>
+    <message id="lollipop">
+        <location filename="main.cpp" line="51"/>
+        <location filename="main.cpp" line="56"/>
+        <location filename="main.cpp" line="75"/>
+        <source>this is the source text</source>
+        <extracomment>commented
+----------
+even more commented</extracomment>
+        <translation type="unfinished"></translation>
+        <extra-meta>so-meta</extra-meta>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="main.cpp" line="67"/>
+        <source>another message</source>
+        <comment>here with a lot of noise in the comment so it is long enough</comment>
+        <translation type="unfinished"></translation>
+        <extra-meta>so-meta</extra-meta>
+    </message>
+</context>
+<context>
     <name>context</name>
     <message>
         <location filename="finddialog.cpp" line="42"/>
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
index 289727904..c96859bdb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
index 289727904..c96859bdb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
index 7a7ad5ee7..759bea068 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
@@ -1,4 +1,3 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main3.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp
index af27d2d01..a6b1a1826 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main3.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -39,45 +39,4 @@
 **
 ****************************************************************************/
 
-// IMPORTANT!!!! If you want to add testdata to this file, 
-// always add it to the end in order to not change the linenumbers of translations!!!
-
-// nothing here
-
-// sickness: multi-\
-line c++ comment } (with brace)
-
-#define This is a closing brace } which was ignored
-} // complain here
-
-#define This is another \
-    closing brace } which was ignored
-} // complain here
-
-#define This is another /* comment in } define */\
-     something /* comment )
-       spanning {multiple} lines */ \
-    closing brace } which was ignored
-} // complain here
-
-#define This is another // comment in } define \
-     something } comment
-} // complain here
-
-char somestring[] = "\
-    continued\n\
-    here and \"quoted\" to activate\n";
-
-    NSString *scriptSource = @"\
-                on SetupNewMail(theRecipientAddress, theSubject, theContent, theAttachmentPath)\n\
-                    tell application \"Mail\" to activate\n\
-                    tell application \"Mail\"\n\
-                        set theMessage to make new outgoing message with properties {visible:true, subject:theSubject, content:theContent}\n\
-                        tell theMessage\n\
-                            make new to recipient at end of to recipients with properties {address:theRecipientAddress}\n\
-                        end tell\n\
-                        tell content of theMessage\n\
-                            make new attachment with properties {file name:theAttachmentPath} at after last paragraph\n\
-                        end tell\n\
-                    end tell\n\
-                end SetupNewMail\n";
+QObject::tr("message from #included .cpp file");
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
index 0db9a8350..54781ba9f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
@@ -136,7 +136,7 @@ class ForwardDecl;
   struct FT_Service_ ## name ## Rec_
 
 
-/* removing this comment will break this test */
+
 
 void Dialog2::func3()
 {
@@ -191,12 +191,12 @@ class Testing : QObject {
 
 //: extra comment for NOOP
 //: which spans multiple lines
-QT_TRANSLATE_NOOP("scope", "string") // 4.4 says the line of this is at the next statement
+QT_TRANSLATE_NOOP("scope", "string") /*: complain & ignore */; // 4.4 says the line of this is at the next statement
 //: extra comment for NOOP3
-QT_TRANSLATE_NOOP3_UTF8("scope", "string", "comment") // 4.4 doesn't see this
+QT_TRANSLATE_NOOP3_UTF8("scope", "string", "comment"); // 4.4 doesn't see this
 
 QT_TRANSLATE_NOOP("scope", "string " // this is an interleaved comment
-                  "continuation on next line")
+                  "continuation on next line");
 
 
 class TestingTake17 : QObject {
@@ -223,7 +223,7 @@ class TestingTake17 : QObject {
 //: again an extra comment, this time for id-based NOOP
 //% "This is supposed\tto be quoted \" newline\n"
 //% "backslashed \\ stuff."
-QT_TRID_NOOP("this_a_id")
+QT_TRID_NOOP("this_a_id");
 
 //~ some thing
 //% "This needs to be here. Really."
@@ -343,3 +343,59 @@ void YetMoreFun::funStuff()
 }
 
 }
+
+
+
+// QTBUG-29998: tr() macro inside square brackets
+void blubb()
+{
+    QMap<QString, QString> d;
+    d[LotsaFun::tr("bracketed")] = "plain";
+}
+
+
+
+// QTBUG-9276 part 2: QT_TR_NOOP in static member initializers
+class TestClass
+{
+    Q_DECLARE_TR_FUNCTIONS(TestClass);
+
+public:
+    static const char TEST_STRING[];
+};
+
+const char TestClass::TEST_STRING[] = QT_TR_NOOP("Test value");
+
+
+
+// derivation from namespaced class
+class Class42 : public NameSchpase::YetMoreFun, Gui::BaseClass
+{
+    Q_OBJECT
+
+    Class42() :
+        NameSchpase::YetMoreFun(),
+        Gui::BaseClass()
+    {
+        tr("does that make sense?");
+    }
+};
+
+Class42::Class42() :
+    NameSchpase::YetMoreFun(),
+    Gui::BaseClass()
+{
+    tr("and does that?");
+}
+
+
+
+// QTBUG-11866: magic comment parsing is too greedy
+Class42::hello(int something /*= 17 */, QString str = Class42::tr("eyo"))
+{
+}
+
+
+
+// QTBUG-27974: strings from included sources are not collected
+#include "included.cpp"
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
index d0dd914d4..ac5c2846e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
@@ -5,4 +5,3 @@ SOURCES += excluded.cpp
 TR_EXCLUDE = $$PWD/excluded.*
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
index cf472ff38..9c7d9df6b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
@@ -35,6 +35,24 @@ backslashed \ stuff.</source>
     </message>
 </context>
 <context>
+    <name>Class42</name>
+    <message>
+        <location filename="main.cpp" line="380"/>
+        <source>does that make sense?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="388"/>
+        <source>and does that?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="394"/>
+        <source>eyo</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Dialog2</name>
     <message numerus="yes">
         <location filename="main.cpp" line="70"/>
@@ -147,6 +165,11 @@ backslashed \ stuff.</source>
         <source>this is inside operator&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="main.cpp" line="353"/>
+        <source>bracketed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NameSchpace::YetMoreFun</name>
@@ -228,6 +251,11 @@ backslashed \ stuff.</source>
         <source>just QObject</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="included.cpp" line="42"/>
+        <source>message from #included .cpp file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QTranslator</name>
@@ -287,6 +315,11 @@ backslashed \ stuff.</source>
         <comment>TestClass</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="main.cpp" line="367"/>
+        <source>Test value</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Testing</name>
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
index 7a7ad5ee7..759bea068 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
@@ -1,4 +1,3 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
index 3ddaa6737..657b535e2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.java
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro
index 7d69cb43d..d549039c4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro
index 7d69cb43d..d549039c4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro
index 7d69cb43d..d549039c4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro
index 7d69cb43d..d549039c4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro
index 7d69cb43d..d549039c4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro
index cc6397936..1040e2227 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.qml
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro
index cc6397936..1040e2227 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.qml
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
index 9c06a2010..fa56972dd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
@@ -1,4 +1,3 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
index 7a7ad5ee7..759bea068 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
@@ -1,4 +1,3 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
index 289727904..c96859bdb 100644
--- a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
index a3d1138ef..a63c4e311 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
@@ -29,4 +29,3 @@ if (exists($$member($$(PATH), 0))) {
 }
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
index 4553e5912..3dc420858 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
@@ -31,4 +31,3 @@ win32: SOURCES += $$system(type files-cc.txt)
 unix: SOURCES += $$system(cat files-cc.txt)
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
index 5401eaa7a..6bfe751f4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
@@ -3,4 +3,3 @@ SOURCES += file*.cpp filter.cpp non-existing.cpp
 include(sub/sub.pri)
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
index 659f27292..5e23538b9 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
@@ -7,4 +7,3 @@ include(relativity/relativity.pri)
 message($$SOURCES)
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
index 334a26b92..df18c5a69 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
@@ -1,4 +1,3 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = ../project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
index ec5cb04cd..28dcadcbf 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
@@ -1,3 +1 @@
 SOURCES += main.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/excluded/excluded.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/excluded/excluded.pro
new file mode 100644
index 000000000..28dcadcbf
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/excluded/excluded.pro
@@ -0,0 +1 @@
+SOURCES += main.cpp
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main2.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/excluded/main.cpp
index 01055fea8..cc99f9db4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main2.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/excluded/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -39,31 +39,12 @@
 **
 ****************************************************************************/
 
-// IMPORTANT!!!! If you want to add testdata to this file, 
+// IMPORTANT!!!! If you want to add testdata to this file,
 // always add it to the end in order to not change the linenumbers of translations!!!
 
-// nothing here
 
-// sickness: multi-\
-line c++ comment } (with brace)
+void func1() {
+    QString fake = QApplication::tr("fake", "This message will not be collected");
+}
 
-#define This is a closing brace } which was ignored
-} // complain here
 
-#define This is another \
-    closing brace } which was ignored
-} // complain here
-
-#define This is another /* comment in } define */\
-     something /* comment )
-       spanning {multiple} lines */ \
-    closing brace } which was ignored
-} // complain here
-
-#define This is another // comment in } define \
-     something } comment
-} // complain here
-
-char somestring[] = "\
-    continued\n\
-    here and \"quoted\" to activate\n";
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
index ba05b4b01..a1863b665 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
@@ -1,2 +1 @@
 SOURCES += main_mac.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
index 13f921703..cad99dc61 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro
@@ -1,3 +1,6 @@
 TEMPLATE = subdirs
 comm.subdir = common
 SUBDIRS = win mac unix comm
+
+SUBDIRS += excluded
+TR_EXCLUDE = excluded
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
index 79594260b..71b1a2252 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
@@ -1,2 +1 @@
 SOURCES += main_unix.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
index 05b1742e7..afd719711 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
@@ -1,2 +1 @@
 SOURCES += main_win.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
index f80b1d4c9..4e2e6ada7 100644
--- a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
@@ -1,4 +1,3 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = translations/project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
index 9c06a2010..fa56972dd 100644
--- a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
@@ -1,4 +1,3 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro
index 55e50d275..28dcadcbf 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro
@@ -1,2 +1 @@
 SOURCES += main.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro
index 55e50d275..28dcadcbf 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro
@@ -1,2 +1 @@
 SOURCES += main.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
index 26a954a26..ac525777c 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
@@ -1,4 +1,3 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = ../../project_sub.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro
index 55e50d275..28dcadcbf 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro
@@ -1,2 +1 @@
 SOURCES += main.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro
index 55e50d275..28dcadcbf 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro
@@ -1,2 +1 @@
 SOURCES += main.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
index 26a954a26..ac525777c 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
@@ -1,4 +1,3 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = ../../project_sub.ts
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index 29b6ba4bb..9134f53b3 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -6,4 +6,3 @@ QT      += help-private sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
new file mode 100644
index 000000000..7d4f86d2f
--- /dev/null
+++ b/tests/manual/manual.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += uiloader
diff --git a/tests/auto/uiloader/.gitignore b/tests/manual/uiloader/.gitignore
index a4b4e8f02..a4b4e8f02 100644
--- a/tests/auto/uiloader/.gitignore
+++ b/tests/manual/uiloader/.gitignore
diff --git a/tests/auto/uiloader/README.TXT b/tests/manual/uiloader/README.TXT
index cbbf0ff77..cbbf0ff77 100644
--- a/tests/auto/uiloader/README.TXT
+++ b/tests/manual/uiloader/README.TXT
diff --git a/tests/auto/uiloader/WTC0090dca226c8.ini b/tests/manual/uiloader/WTC0090dca226c8.ini
index 5cf6c4fee..5cf6c4fee 100644
--- a/tests/auto/uiloader/WTC0090dca226c8.ini
+++ b/tests/manual/uiloader/WTC0090dca226c8.ini
diff --git a/tests/auto/uiloader/baseline/Dialog_with_Buttons_Bottom.ui b/tests/manual/uiloader/baseline/Dialog_with_Buttons_Bottom.ui
index 18d31ab91..18d31ab91 100644
--- a/tests/auto/uiloader/baseline/Dialog_with_Buttons_Bottom.ui
+++ b/tests/manual/uiloader/baseline/Dialog_with_Buttons_Bottom.ui
diff --git a/tests/auto/uiloader/baseline/Dialog_with_Buttons_Right.ui b/tests/manual/uiloader/baseline/Dialog_with_Buttons_Right.ui
index 703d594f4..703d594f4 100644
--- a/tests/auto/uiloader/baseline/Dialog_with_Buttons_Right.ui
+++ b/tests/manual/uiloader/baseline/Dialog_with_Buttons_Right.ui
diff --git a/tests/auto/uiloader/baseline/Dialog_without_Buttons.ui b/tests/manual/uiloader/baseline/Dialog_without_Buttons.ui
index 1be629818..1be629818 100644
--- a/tests/auto/uiloader/baseline/Dialog_without_Buttons.ui
+++ b/tests/manual/uiloader/baseline/Dialog_without_Buttons.ui
diff --git a/tests/auto/uiloader/baseline/Main_Window.ui b/tests/manual/uiloader/baseline/Main_Window.ui
index e324db829..e324db829 100644
--- a/tests/auto/uiloader/baseline/Main_Window.ui
+++ b/tests/manual/uiloader/baseline/Main_Window.ui
diff --git a/tests/auto/uiloader/baseline/Widget.ui b/tests/manual/uiloader/baseline/Widget.ui
index 9f6f60006..9f6f60006 100644
--- a/tests/auto/uiloader/baseline/Widget.ui
+++ b/tests/manual/uiloader/baseline/Widget.ui
diff --git a/tests/auto/uiloader/baseline/addlinkdialog.ui b/tests/manual/uiloader/baseline/addlinkdialog.ui
index 3171159f9..3171159f9 100644
--- a/tests/auto/uiloader/baseline/addlinkdialog.ui
+++ b/tests/manual/uiloader/baseline/addlinkdialog.ui
diff --git a/tests/auto/uiloader/baseline/addtorrentform.ui b/tests/manual/uiloader/baseline/addtorrentform.ui
index 950bb6711..950bb6711 100644
--- a/tests/auto/uiloader/baseline/addtorrentform.ui
+++ b/tests/manual/uiloader/baseline/addtorrentform.ui
diff --git a/tests/auto/uiloader/baseline/authenticationdialog.ui b/tests/manual/uiloader/baseline/authenticationdialog.ui
index 82d908cff..82d908cff 100644
--- a/tests/auto/uiloader/baseline/authenticationdialog.ui
+++ b/tests/manual/uiloader/baseline/authenticationdialog.ui
diff --git a/tests/auto/uiloader/baseline/backside.ui b/tests/manual/uiloader/baseline/backside.ui
index afa488c6f..afa488c6f 100644
--- a/tests/auto/uiloader/baseline/backside.ui
+++ b/tests/manual/uiloader/baseline/backside.ui
diff --git a/tests/auto/uiloader/baseline/batchtranslation.ui b/tests/manual/uiloader/baseline/batchtranslation.ui
index 25a82d773..25a82d773 100644
--- a/tests/auto/uiloader/baseline/batchtranslation.ui
+++ b/tests/manual/uiloader/baseline/batchtranslation.ui
diff --git a/tests/auto/uiloader/baseline/bookmarkdialog.ui b/tests/manual/uiloader/baseline/bookmarkdialog.ui
index 2d6470c54..2d6470c54 100644
--- a/tests/auto/uiloader/baseline/bookmarkdialog.ui
+++ b/tests/manual/uiloader/baseline/bookmarkdialog.ui
diff --git a/tests/auto/uiloader/baseline/bookwindow.ui b/tests/manual/uiloader/baseline/bookwindow.ui
index 659d32456..659d32456 100644
--- a/tests/auto/uiloader/baseline/bookwindow.ui
+++ b/tests/manual/uiloader/baseline/bookwindow.ui
diff --git a/tests/auto/uiloader/baseline/browserwidget.ui b/tests/manual/uiloader/baseline/browserwidget.ui
index 20946f0ed..20946f0ed 100644
--- a/tests/auto/uiloader/baseline/browserwidget.ui
+++ b/tests/manual/uiloader/baseline/browserwidget.ui
diff --git a/tests/auto/uiloader/baseline/calculator.ui b/tests/manual/uiloader/baseline/calculator.ui
index bb519ba2a..bb519ba2a 100644
--- a/tests/auto/uiloader/baseline/calculator.ui
+++ b/tests/manual/uiloader/baseline/calculator.ui
diff --git a/tests/auto/uiloader/baseline/calculatorform.ui b/tests/manual/uiloader/baseline/calculatorform.ui
index dda0e62dd..dda0e62dd 100644
--- a/tests/auto/uiloader/baseline/calculatorform.ui
+++ b/tests/manual/uiloader/baseline/calculatorform.ui
diff --git a/tests/auto/uiloader/baseline/certificateinfo.ui b/tests/manual/uiloader/baseline/certificateinfo.ui
index 3761fe8f5..3761fe8f5 100644
--- a/tests/auto/uiloader/baseline/certificateinfo.ui
+++ b/tests/manual/uiloader/baseline/certificateinfo.ui
diff --git a/tests/auto/uiloader/baseline/chatdialog.ui b/tests/manual/uiloader/baseline/chatdialog.ui
index c85e0d0f5..c85e0d0f5 100644
--- a/tests/auto/uiloader/baseline/chatdialog.ui
+++ b/tests/manual/uiloader/baseline/chatdialog.ui
diff --git a/tests/auto/uiloader/baseline/chatmainwindow.ui b/tests/manual/uiloader/baseline/chatmainwindow.ui
index 0616dcb13..0616dcb13 100644
--- a/tests/auto/uiloader/baseline/chatmainwindow.ui
+++ b/tests/manual/uiloader/baseline/chatmainwindow.ui
diff --git a/tests/auto/uiloader/baseline/chatsetnickname.ui b/tests/manual/uiloader/baseline/chatsetnickname.ui
index fb9894e09..fb9894e09 100644
--- a/tests/auto/uiloader/baseline/chatsetnickname.ui
+++ b/tests/manual/uiloader/baseline/chatsetnickname.ui
diff --git a/tests/auto/uiloader/baseline/config.ui b/tests/manual/uiloader/baseline/config.ui
index ca116231f..ca116231f 100644
--- a/tests/auto/uiloader/baseline/config.ui
+++ b/tests/manual/uiloader/baseline/config.ui
diff --git a/tests/auto/uiloader/baseline/connectdialog.ui b/tests/manual/uiloader/baseline/connectdialog.ui
index bd062ebaa..bd062ebaa 100644
--- a/tests/auto/uiloader/baseline/connectdialog.ui
+++ b/tests/manual/uiloader/baseline/connectdialog.ui
diff --git a/tests/auto/uiloader/baseline/controller.ui b/tests/manual/uiloader/baseline/controller.ui
index 379015bf3..379015bf3 100644
--- a/tests/auto/uiloader/baseline/controller.ui
+++ b/tests/manual/uiloader/baseline/controller.ui
diff --git a/tests/auto/uiloader/baseline/cookies.ui b/tests/manual/uiloader/baseline/cookies.ui
index c4bccc548..c4bccc548 100644
--- a/tests/auto/uiloader/baseline/cookies.ui
+++ b/tests/manual/uiloader/baseline/cookies.ui
diff --git a/tests/auto/uiloader/baseline/cookiesexceptions.ui b/tests/manual/uiloader/baseline/cookiesexceptions.ui
index 3d9ef6241..3d9ef6241 100644
--- a/tests/auto/uiloader/baseline/cookiesexceptions.ui
+++ b/tests/manual/uiloader/baseline/cookiesexceptions.ui
diff --git a/tests/auto/uiloader/baseline/css_borderimage.ui b/tests/manual/uiloader/baseline/css_borderimage.ui
index 4a59ca2e0..4a59ca2e0 100644
--- a/tests/auto/uiloader/baseline/css_borderimage.ui
+++ b/tests/manual/uiloader/baseline/css_borderimage.ui
diff --git a/tests/auto/uiloader/baseline/css_borderimage_allwidgets.ui b/tests/manual/uiloader/baseline/css_borderimage_allwidgets.ui
index 0ece79a08..0ece79a08 100644
--- a/tests/auto/uiloader/baseline/css_borderimage_allwidgets.ui
+++ b/tests/manual/uiloader/baseline/css_borderimage_allwidgets.ui
diff --git a/tests/auto/uiloader/baseline/css_borderradius_allwidgets.ui b/tests/manual/uiloader/baseline/css_borderradius_allwidgets.ui
index 8c5f57cb1..8c5f57cb1 100644
--- a/tests/auto/uiloader/baseline/css_borderradius_allwidgets.ui
+++ b/tests/manual/uiloader/baseline/css_borderradius_allwidgets.ui
diff --git a/tests/auto/uiloader/baseline/css_buttons_background.ui b/tests/manual/uiloader/baseline/css_buttons_background.ui
index 3d80aeb4b..3d80aeb4b 100644
--- a/tests/auto/uiloader/baseline/css_buttons_background.ui
+++ b/tests/manual/uiloader/baseline/css_buttons_background.ui
diff --git a/tests/auto/uiloader/baseline/css_combobox_background.ui b/tests/manual/uiloader/baseline/css_combobox_background.ui
index 387b37197..387b37197 100644
--- a/tests/auto/uiloader/baseline/css_combobox_background.ui
+++ b/tests/manual/uiloader/baseline/css_combobox_background.ui
diff --git a/tests/auto/uiloader/baseline/css_exemple_coffee.ui b/tests/manual/uiloader/baseline/css_exemple_coffee.ui
index 619f912a9..619f912a9 100644
--- a/tests/auto/uiloader/baseline/css_exemple_coffee.ui
+++ b/tests/manual/uiloader/baseline/css_exemple_coffee.ui
diff --git a/tests/auto/uiloader/baseline/css_exemple_pagefold.ui b/tests/manual/uiloader/baseline/css_exemple_pagefold.ui
index d23fad34c..d23fad34c 100644
--- a/tests/auto/uiloader/baseline/css_exemple_pagefold.ui
+++ b/tests/manual/uiloader/baseline/css_exemple_pagefold.ui
diff --git a/tests/auto/uiloader/baseline/css_exemple_usage.ui b/tests/manual/uiloader/baseline/css_exemple_usage.ui
index 0ddd2ed79..0ddd2ed79 100644
--- a/tests/auto/uiloader/baseline/css_exemple_usage.ui
+++ b/tests/manual/uiloader/baseline/css_exemple_usage.ui
diff --git a/tests/auto/uiloader/baseline/css_frames.ui b/tests/manual/uiloader/baseline/css_frames.ui
index d1397bb1d..d1397bb1d 100644
--- a/tests/auto/uiloader/baseline/css_frames.ui
+++ b/tests/manual/uiloader/baseline/css_frames.ui
diff --git a/tests/auto/uiloader/baseline/css_groupboxes.ui b/tests/manual/uiloader/baseline/css_groupboxes.ui
index 7f5464aa5..7f5464aa5 100644
--- a/tests/auto/uiloader/baseline/css_groupboxes.ui
+++ b/tests/manual/uiloader/baseline/css_groupboxes.ui
diff --git a/tests/auto/uiloader/baseline/css_itemview_task258382.ui b/tests/manual/uiloader/baseline/css_itemview_task258382.ui
index 11c56b4ba..11c56b4ba 100644
--- a/tests/auto/uiloader/baseline/css_itemview_task258382.ui
+++ b/tests/manual/uiloader/baseline/css_itemview_task258382.ui
diff --git a/tests/auto/uiloader/baseline/css_qprogressbar.ui b/tests/manual/uiloader/baseline/css_qprogressbar.ui
index 6b3e2f0e9..6b3e2f0e9 100644
--- a/tests/auto/uiloader/baseline/css_qprogressbar.ui
+++ b/tests/manual/uiloader/baseline/css_qprogressbar.ui
diff --git a/tests/auto/uiloader/baseline/css_qtabwidget.ui b/tests/manual/uiloader/baseline/css_qtabwidget.ui
index 7c2d24f3a..7c2d24f3a 100644
--- a/tests/auto/uiloader/baseline/css_qtabwidget.ui
+++ b/tests/manual/uiloader/baseline/css_qtabwidget.ui
diff --git a/tests/auto/uiloader/baseline/css_qtbug6855.ui b/tests/manual/uiloader/baseline/css_qtbug6855.ui
index 0727f6ba9..0727f6ba9 100644
--- a/tests/auto/uiloader/baseline/css_qtbug6855.ui
+++ b/tests/manual/uiloader/baseline/css_qtbug6855.ui
diff --git a/tests/auto/uiloader/baseline/css_qtbug7737_borderimageradius.ui b/tests/manual/uiloader/baseline/css_qtbug7737_borderimageradius.ui
index 089cb76a1..089cb76a1 100644
--- a/tests/auto/uiloader/baseline/css_qtbug7737_borderimageradius.ui
+++ b/tests/manual/uiloader/baseline/css_qtbug7737_borderimageradius.ui
diff --git a/tests/auto/uiloader/baseline/css_scroll.ui b/tests/manual/uiloader/baseline/css_scroll.ui
index 6ac688604..6ac688604 100644
--- a/tests/auto/uiloader/baseline/css_scroll.ui
+++ b/tests/manual/uiloader/baseline/css_scroll.ui
diff --git a/tests/auto/uiloader/baseline/css_scrollarea_base.ui b/tests/manual/uiloader/baseline/css_scrollarea_base.ui
index 495401f40..495401f40 100644
--- a/tests/auto/uiloader/baseline/css_scrollarea_base.ui
+++ b/tests/manual/uiloader/baseline/css_scrollarea_base.ui
diff --git a/tests/auto/uiloader/baseline/css_splitter.ui b/tests/manual/uiloader/baseline/css_splitter.ui
index 99dbc180a..99dbc180a 100644
--- a/tests/auto/uiloader/baseline/css_splitter.ui
+++ b/tests/manual/uiloader/baseline/css_splitter.ui
diff --git a/tests/auto/uiloader/baseline/css_tab_border.ui b/tests/manual/uiloader/baseline/css_tab_border.ui
index cefb9d8fd..cefb9d8fd 100644
--- a/tests/auto/uiloader/baseline/css_tab_border.ui
+++ b/tests/manual/uiloader/baseline/css_tab_border.ui
diff --git a/tests/auto/uiloader/baseline/css_tab_closebutton.ui b/tests/manual/uiloader/baseline/css_tab_closebutton.ui
index 82bd2b550..82bd2b550 100644
--- a/tests/auto/uiloader/baseline/css_tab_closebutton.ui
+++ b/tests/manual/uiloader/baseline/css_tab_closebutton.ui
diff --git a/tests/auto/uiloader/baseline/css_tab_task213374.ui b/tests/manual/uiloader/baseline/css_tab_task213374.ui
index f3567aede..f3567aede 100644
--- a/tests/auto/uiloader/baseline/css_tab_task213374.ui
+++ b/tests/manual/uiloader/baseline/css_tab_task213374.ui
diff --git a/tests/auto/uiloader/baseline/css_task255849_downarrow.ui b/tests/manual/uiloader/baseline/css_task255849_downarrow.ui
index d3e99b161..d3e99b161 100644
--- a/tests/auto/uiloader/baseline/css_task255849_downarrow.ui
+++ b/tests/manual/uiloader/baseline/css_task255849_downarrow.ui
diff --git a/tests/auto/uiloader/baseline/css_task259226_spinboxes.ui b/tests/manual/uiloader/baseline/css_task259226_spinboxes.ui
index eb9ade316..eb9ade316 100644
--- a/tests/auto/uiloader/baseline/css_task259226_spinboxes.ui
+++ b/tests/manual/uiloader/baseline/css_task259226_spinboxes.ui
diff --git a/tests/auto/uiloader/baseline/default.ui b/tests/manual/uiloader/baseline/default.ui
index 431a40956..431a40956 100644
--- a/tests/auto/uiloader/baseline/default.ui
+++ b/tests/manual/uiloader/baseline/default.ui
diff --git a/tests/auto/uiloader/baseline/dialog.ui b/tests/manual/uiloader/baseline/dialog.ui
index e99d6fb3c..e99d6fb3c 100644
--- a/tests/auto/uiloader/baseline/dialog.ui
+++ b/tests/manual/uiloader/baseline/dialog.ui
diff --git a/tests/auto/uiloader/baseline/downloaditem.ui b/tests/manual/uiloader/baseline/downloaditem.ui
index 4a0a0fd9a..4a0a0fd9a 100644
--- a/tests/auto/uiloader/baseline/downloaditem.ui
+++ b/tests/manual/uiloader/baseline/downloaditem.ui
diff --git a/tests/auto/uiloader/baseline/downloads.ui b/tests/manual/uiloader/baseline/downloads.ui
index a2e256935..a2e256935 100644
--- a/tests/auto/uiloader/baseline/downloads.ui
+++ b/tests/manual/uiloader/baseline/downloads.ui
diff --git a/tests/auto/uiloader/baseline/embeddeddialog.ui b/tests/manual/uiloader/baseline/embeddeddialog.ui
index f967b1008..f967b1008 100644
--- a/tests/auto/uiloader/baseline/embeddeddialog.ui
+++ b/tests/manual/uiloader/baseline/embeddeddialog.ui
diff --git a/tests/auto/uiloader/baseline/filespage.ui b/tests/manual/uiloader/baseline/filespage.ui
index d308b9664..d308b9664 100644
--- a/tests/auto/uiloader/baseline/filespage.ui
+++ b/tests/manual/uiloader/baseline/filespage.ui
diff --git a/tests/auto/uiloader/baseline/filternamedialog.ui b/tests/manual/uiloader/baseline/filternamedialog.ui
index be6f17dfb..be6f17dfb 100644
--- a/tests/auto/uiloader/baseline/filternamedialog.ui
+++ b/tests/manual/uiloader/baseline/filternamedialog.ui
diff --git a/tests/auto/uiloader/baseline/filterpage.ui b/tests/manual/uiloader/baseline/filterpage.ui
index 7cda3d9be..7cda3d9be 100644
--- a/tests/auto/uiloader/baseline/filterpage.ui
+++ b/tests/manual/uiloader/baseline/filterpage.ui
diff --git a/tests/auto/uiloader/baseline/finddialog.ui b/tests/manual/uiloader/baseline/finddialog.ui
index eb73d7574..eb73d7574 100644
--- a/tests/auto/uiloader/baseline/finddialog.ui
+++ b/tests/manual/uiloader/baseline/finddialog.ui
diff --git a/tests/auto/uiloader/baseline/formwindowsettings.ui b/tests/manual/uiloader/baseline/formwindowsettings.ui
index 120d9c487..120d9c487 100644
--- a/tests/auto/uiloader/baseline/formwindowsettings.ui
+++ b/tests/manual/uiloader/baseline/formwindowsettings.ui
diff --git a/tests/auto/uiloader/baseline/generalpage.ui b/tests/manual/uiloader/baseline/generalpage.ui
index 9c2babb0a..9c2babb0a 100644
--- a/tests/auto/uiloader/baseline/generalpage.ui
+++ b/tests/manual/uiloader/baseline/generalpage.ui
diff --git a/tests/auto/uiloader/baseline/gridpanel.ui b/tests/manual/uiloader/baseline/gridpanel.ui
index adfdd3684..adfdd3684 100644
--- a/tests/auto/uiloader/baseline/gridpanel.ui
+++ b/tests/manual/uiloader/baseline/gridpanel.ui
diff --git a/tests/auto/uiloader/baseline/helpdialog.ui b/tests/manual/uiloader/baseline/helpdialog.ui
index 1c3ef0ac7..1c3ef0ac7 100644
--- a/tests/auto/uiloader/baseline/helpdialog.ui
+++ b/tests/manual/uiloader/baseline/helpdialog.ui
diff --git a/tests/auto/uiloader/baseline/history.ui b/tests/manual/uiloader/baseline/history.ui
index 0944940e7..0944940e7 100644
--- a/tests/auto/uiloader/baseline/history.ui
+++ b/tests/manual/uiloader/baseline/history.ui
diff --git a/tests/auto/uiloader/baseline/identifierpage.ui b/tests/manual/uiloader/baseline/identifierpage.ui
index cd0df7563..cd0df7563 100644
--- a/tests/auto/uiloader/baseline/identifierpage.ui
+++ b/tests/manual/uiloader/baseline/identifierpage.ui
diff --git a/tests/auto/uiloader/baseline/imagedialog.ui b/tests/manual/uiloader/baseline/imagedialog.ui
index 1c5e546f2..1c5e546f2 100644
--- a/tests/auto/uiloader/baseline/imagedialog.ui
+++ b/tests/manual/uiloader/baseline/imagedialog.ui
diff --git a/tests/auto/uiloader/baseline/images/arrow-down.png b/tests/manual/uiloader/baseline/images/arrow-down.png
index 7c9274f30..7c9274f30 100644
--- a/tests/auto/uiloader/baseline/images/arrow-down.png
+++ b/tests/manual/uiloader/baseline/images/arrow-down.png
diff --git a/tests/auto/uiloader/baseline/images/arrow-up.png b/tests/manual/uiloader/baseline/images/arrow-up.png
index 758a0d1af..758a0d1af 100644
--- a/tests/auto/uiloader/baseline/images/arrow-up.png
+++ b/tests/manual/uiloader/baseline/images/arrow-up.png
diff --git a/tests/auto/uiloader/baseline/images/borderimage.png b/tests/manual/uiloader/baseline/images/borderimage.png
index 199fc890f..199fc890f 100644
--- a/tests/auto/uiloader/baseline/images/borderimage.png
+++ b/tests/manual/uiloader/baseline/images/borderimage.png
diff --git a/tests/auto/uiloader/baseline/images/checkbox_checked.png b/tests/manual/uiloader/baseline/images/checkbox_checked.png
index cbf06f651..cbf06f651 100644
--- a/tests/auto/uiloader/baseline/images/checkbox_checked.png
+++ b/tests/manual/uiloader/baseline/images/checkbox_checked.png
diff --git a/tests/auto/uiloader/baseline/images/checkbox_checked_hover.png b/tests/manual/uiloader/baseline/images/checkbox_checked_hover.png
index fb4d4d3fd..fb4d4d3fd 100644
--- a/tests/auto/uiloader/baseline/images/checkbox_checked_hover.png
+++ b/tests/manual/uiloader/baseline/images/checkbox_checked_hover.png
diff --git a/tests/auto/uiloader/baseline/images/checkbox_checked_pressed.png b/tests/manual/uiloader/baseline/images/checkbox_checked_pressed.png
index 852fcc030..852fcc030 100644
--- a/tests/auto/uiloader/baseline/images/checkbox_checked_pressed.png
+++ b/tests/manual/uiloader/baseline/images/checkbox_checked_pressed.png
diff --git a/tests/auto/uiloader/baseline/images/checkbox_unchecked.png b/tests/manual/uiloader/baseline/images/checkbox_unchecked.png
index 5f5465582..5f5465582 100644
--- a/tests/auto/uiloader/baseline/images/checkbox_unchecked.png
+++ b/tests/manual/uiloader/baseline/images/checkbox_unchecked.png
diff --git a/tests/auto/uiloader/baseline/images/checkbox_unchecked_hover.png b/tests/manual/uiloader/baseline/images/checkbox_unchecked_hover.png
index 687364497..687364497 100644
--- a/tests/auto/uiloader/baseline/images/checkbox_unchecked_hover.png
+++ b/tests/manual/uiloader/baseline/images/checkbox_unchecked_hover.png
diff --git a/tests/auto/uiloader/baseline/images/checkbox_unchecked_pressed.png b/tests/manual/uiloader/baseline/images/checkbox_unchecked_pressed.png
index 6a768c44d..6a768c44d 100644
--- a/tests/auto/uiloader/baseline/images/checkbox_unchecked_pressed.png
+++ b/tests/manual/uiloader/baseline/images/checkbox_unchecked_pressed.png
diff --git a/tests/auto/uiloader/baseline/images/down_arrow.png b/tests/manual/uiloader/baseline/images/down_arrow.png
index 85004aeaf..85004aeaf 100644
--- a/tests/auto/uiloader/baseline/images/down_arrow.png
+++ b/tests/manual/uiloader/baseline/images/down_arrow.png
diff --git a/tests/auto/uiloader/baseline/images/down_arrow_disabled.png b/tests/manual/uiloader/baseline/images/down_arrow_disabled.png
index d9eefed4c..d9eefed4c 100644
--- a/tests/auto/uiloader/baseline/images/down_arrow_disabled.png
+++ b/tests/manual/uiloader/baseline/images/down_arrow_disabled.png
diff --git a/tests/auto/uiloader/baseline/images/frame.png b/tests/manual/uiloader/baseline/images/frame.png
index 05a600502..05a600502 100644
--- a/tests/auto/uiloader/baseline/images/frame.png
+++ b/tests/manual/uiloader/baseline/images/frame.png
diff --git a/tests/auto/uiloader/baseline/images/pagefold.png b/tests/manual/uiloader/baseline/images/pagefold.png
index 69be8f2a3..69be8f2a3 100644
--- a/tests/auto/uiloader/baseline/images/pagefold.png
+++ b/tests/manual/uiloader/baseline/images/pagefold.png
diff --git a/tests/auto/uiloader/baseline/images/pushbutton.png b/tests/manual/uiloader/baseline/images/pushbutton.png
index c7529ba02..c7529ba02 100644
--- a/tests/auto/uiloader/baseline/images/pushbutton.png
+++ b/tests/manual/uiloader/baseline/images/pushbutton.png
diff --git a/tests/auto/uiloader/baseline/images/pushbutton_hover.png b/tests/manual/uiloader/baseline/images/pushbutton_hover.png
index af0ef9d56..af0ef9d56 100644
--- a/tests/auto/uiloader/baseline/images/pushbutton_hover.png
+++ b/tests/manual/uiloader/baseline/images/pushbutton_hover.png
diff --git a/tests/auto/uiloader/baseline/images/pushbutton_pressed.png b/tests/manual/uiloader/baseline/images/pushbutton_pressed.png
index f7381f752..f7381f752 100644
--- a/tests/auto/uiloader/baseline/images/pushbutton_pressed.png
+++ b/tests/manual/uiloader/baseline/images/pushbutton_pressed.png
diff --git a/tests/auto/uiloader/baseline/images/radiobutton_checked.png b/tests/manual/uiloader/baseline/images/radiobutton_checked.png
index 8ab915757..8ab915757 100644
--- a/tests/auto/uiloader/baseline/images/radiobutton_checked.png
+++ b/tests/manual/uiloader/baseline/images/radiobutton_checked.png
diff --git a/tests/auto/uiloader/baseline/images/radiobutton_checked_hover.png b/tests/manual/uiloader/baseline/images/radiobutton_checked_hover.png
index d68cb009a..d68cb009a 100644
--- a/tests/auto/uiloader/baseline/images/radiobutton_checked_hover.png
+++ b/tests/manual/uiloader/baseline/images/radiobutton_checked_hover.png
diff --git a/tests/auto/uiloader/baseline/images/radiobutton_checked_pressed.png b/tests/manual/uiloader/baseline/images/radiobutton_checked_pressed.png
index e3cd5a59e..e3cd5a59e 100644
--- a/tests/auto/uiloader/baseline/images/radiobutton_checked_pressed.png
+++ b/tests/manual/uiloader/baseline/images/radiobutton_checked_pressed.png
diff --git a/tests/auto/uiloader/baseline/images/radiobutton_unchecked.png b/tests/manual/uiloader/baseline/images/radiobutton_unchecked.png
index 321a9a155..321a9a155 100644
--- a/tests/auto/uiloader/baseline/images/radiobutton_unchecked.png
+++ b/tests/manual/uiloader/baseline/images/radiobutton_unchecked.png
diff --git a/tests/auto/uiloader/baseline/images/radiobutton_unchecked_hover.png b/tests/manual/uiloader/baseline/images/radiobutton_unchecked_hover.png
index 666a3b0bd..666a3b0bd 100644
--- a/tests/auto/uiloader/baseline/images/radiobutton_unchecked_hover.png
+++ b/tests/manual/uiloader/baseline/images/radiobutton_unchecked_hover.png
diff --git a/tests/auto/uiloader/baseline/images/radiobutton_unchecked_pressed.png b/tests/manual/uiloader/baseline/images/radiobutton_unchecked_pressed.png
index c4b0567aa..c4b0567aa 100644
--- a/tests/auto/uiloader/baseline/images/radiobutton_unchecked_pressed.png
+++ b/tests/manual/uiloader/baseline/images/radiobutton_unchecked_pressed.png
diff --git a/tests/auto/uiloader/baseline/images/sizegrip.png b/tests/manual/uiloader/baseline/images/sizegrip.png
index 350583aaa..350583aaa 100644
--- a/tests/auto/uiloader/baseline/images/sizegrip.png
+++ b/tests/manual/uiloader/baseline/images/sizegrip.png
diff --git a/tests/auto/uiloader/baseline/images/spindown.png b/tests/manual/uiloader/baseline/images/spindown.png
index 7ff3c6492..7ff3c6492 100644
--- a/tests/auto/uiloader/baseline/images/spindown.png
+++ b/tests/manual/uiloader/baseline/images/spindown.png
diff --git a/tests/auto/uiloader/baseline/images/spindown_hover.png b/tests/manual/uiloader/baseline/images/spindown_hover.png
index 1486c4dfe..1486c4dfe 100644
--- a/tests/auto/uiloader/baseline/images/spindown_hover.png
+++ b/tests/manual/uiloader/baseline/images/spindown_hover.png
diff --git a/tests/auto/uiloader/baseline/images/spindown_off.png b/tests/manual/uiloader/baseline/images/spindown_off.png
index a90ab3f03..a90ab3f03 100644
--- a/tests/auto/uiloader/baseline/images/spindown_off.png
+++ b/tests/manual/uiloader/baseline/images/spindown_off.png
diff --git a/tests/auto/uiloader/baseline/images/spindown_pressed.png b/tests/manual/uiloader/baseline/images/spindown_pressed.png
index f6271cbde..f6271cbde 100644
--- a/tests/auto/uiloader/baseline/images/spindown_pressed.png
+++ b/tests/manual/uiloader/baseline/images/spindown_pressed.png
diff --git a/tests/auto/uiloader/baseline/images/spinup.png b/tests/manual/uiloader/baseline/images/spinup.png
index 1069dd00d..1069dd00d 100644
--- a/tests/auto/uiloader/baseline/images/spinup.png
+++ b/tests/manual/uiloader/baseline/images/spinup.png
diff --git a/tests/auto/uiloader/baseline/images/spinup_hover.png b/tests/manual/uiloader/baseline/images/spinup_hover.png
index 884c8d77c..884c8d77c 100644
--- a/tests/auto/uiloader/baseline/images/spinup_hover.png
+++ b/tests/manual/uiloader/baseline/images/spinup_hover.png
diff --git a/tests/auto/uiloader/baseline/images/spinup_off.png b/tests/manual/uiloader/baseline/images/spinup_off.png
index 02dad1fb2..02dad1fb2 100644
--- a/tests/auto/uiloader/baseline/images/spinup_off.png
+++ b/tests/manual/uiloader/baseline/images/spinup_off.png
diff --git a/tests/auto/uiloader/baseline/images/spinup_pressed.png b/tests/manual/uiloader/baseline/images/spinup_pressed.png
index b1843e2a1..b1843e2a1 100644
--- a/tests/auto/uiloader/baseline/images/spinup_pressed.png
+++ b/tests/manual/uiloader/baseline/images/spinup_pressed.png
diff --git a/tests/auto/uiloader/baseline/images/splitter_horizontal.png b/tests/manual/uiloader/baseline/images/splitter_horizontal.png
index 66107cf54..66107cf54 100644
--- a/tests/auto/uiloader/baseline/images/splitter_horizontal.png
+++ b/tests/manual/uiloader/baseline/images/splitter_horizontal.png
diff --git a/tests/auto/uiloader/baseline/images/splitter_vertical.png b/tests/manual/uiloader/baseline/images/splitter_vertical.png
index f907c0b57..f907c0b57 100644
--- a/tests/auto/uiloader/baseline/images/splitter_vertical.png
+++ b/tests/manual/uiloader/baseline/images/splitter_vertical.png
diff --git a/tests/auto/uiloader/baseline/images/up_arrow.png b/tests/manual/uiloader/baseline/images/up_arrow.png
index e7f7ddb3a..e7f7ddb3a 100644
--- a/tests/auto/uiloader/baseline/images/up_arrow.png
+++ b/tests/manual/uiloader/baseline/images/up_arrow.png
diff --git a/tests/auto/uiloader/baseline/images/up_arrow_disabled.png b/tests/manual/uiloader/baseline/images/up_arrow_disabled.png
index 4d2c27770..4d2c27770 100644
--- a/tests/auto/uiloader/baseline/images/up_arrow_disabled.png
+++ b/tests/manual/uiloader/baseline/images/up_arrow_disabled.png
diff --git a/tests/auto/uiloader/baseline/inputpage.ui b/tests/manual/uiloader/baseline/inputpage.ui
index e7cd3a0fa..e7cd3a0fa 100644
--- a/tests/auto/uiloader/baseline/inputpage.ui
+++ b/tests/manual/uiloader/baseline/inputpage.ui
diff --git a/tests/auto/uiloader/baseline/installdialog.ui b/tests/manual/uiloader/baseline/installdialog.ui
index 21a05da77..21a05da77 100644
--- a/tests/auto/uiloader/baseline/installdialog.ui
+++ b/tests/manual/uiloader/baseline/installdialog.ui
diff --git a/tests/auto/uiloader/baseline/languagesdialog.ui b/tests/manual/uiloader/baseline/languagesdialog.ui
index 93b490e9e..93b490e9e 100644
--- a/tests/auto/uiloader/baseline/languagesdialog.ui
+++ b/tests/manual/uiloader/baseline/languagesdialog.ui
diff --git a/tests/auto/uiloader/baseline/listwidgeteditor.ui b/tests/manual/uiloader/baseline/listwidgeteditor.ui
index d78aebfc5..d78aebfc5 100644
--- a/tests/auto/uiloader/baseline/listwidgeteditor.ui
+++ b/tests/manual/uiloader/baseline/listwidgeteditor.ui
diff --git a/tests/auto/uiloader/baseline/mainwindow.ui b/tests/manual/uiloader/baseline/mainwindow.ui
index f6eda4fdd..f6eda4fdd 100644
--- a/tests/auto/uiloader/baseline/mainwindow.ui
+++ b/tests/manual/uiloader/baseline/mainwindow.ui
diff --git a/tests/auto/uiloader/baseline/mainwindowbase.ui b/tests/manual/uiloader/baseline/mainwindowbase.ui
index d1854c8e7..d1854c8e7 100644
--- a/tests/auto/uiloader/baseline/mainwindowbase.ui
+++ b/tests/manual/uiloader/baseline/mainwindowbase.ui
diff --git a/tests/auto/uiloader/baseline/mydialog.ui b/tests/manual/uiloader/baseline/mydialog.ui
index d765b3076..d765b3076 100644
--- a/tests/auto/uiloader/baseline/mydialog.ui
+++ b/tests/manual/uiloader/baseline/mydialog.ui
diff --git a/tests/auto/uiloader/baseline/myform.ui b/tests/manual/uiloader/baseline/myform.ui
index 00702e860..00702e860 100644
--- a/tests/auto/uiloader/baseline/myform.ui
+++ b/tests/manual/uiloader/baseline/myform.ui
diff --git a/tests/auto/uiloader/baseline/newactiondialog.ui b/tests/manual/uiloader/baseline/newactiondialog.ui
index f44043bc7..f44043bc7 100644
--- a/tests/auto/uiloader/baseline/newactiondialog.ui
+++ b/tests/manual/uiloader/baseline/newactiondialog.ui
diff --git a/tests/auto/uiloader/baseline/newdynamicpropertydialog.ui b/tests/manual/uiloader/baseline/newdynamicpropertydialog.ui
index 2aa91f3e9..2aa91f3e9 100644
--- a/tests/auto/uiloader/baseline/newdynamicpropertydialog.ui
+++ b/tests/manual/uiloader/baseline/newdynamicpropertydialog.ui
diff --git a/tests/auto/uiloader/baseline/newform.ui b/tests/manual/uiloader/baseline/newform.ui
index 6ec5511c2..6ec5511c2 100644
--- a/tests/auto/uiloader/baseline/newform.ui
+++ b/tests/manual/uiloader/baseline/newform.ui
diff --git a/tests/auto/uiloader/baseline/orderdialog.ui b/tests/manual/uiloader/baseline/orderdialog.ui
index 04851fd1a..04851fd1a 100644
--- a/tests/auto/uiloader/baseline/orderdialog.ui
+++ b/tests/manual/uiloader/baseline/orderdialog.ui
diff --git a/tests/auto/uiloader/baseline/outputpage.ui b/tests/manual/uiloader/baseline/outputpage.ui
index 755f81808..755f81808 100644
--- a/tests/auto/uiloader/baseline/outputpage.ui
+++ b/tests/manual/uiloader/baseline/outputpage.ui
diff --git a/tests/auto/uiloader/baseline/pagefold.ui b/tests/manual/uiloader/baseline/pagefold.ui
index 7ae313c33..7ae313c33 100644
--- a/tests/auto/uiloader/baseline/pagefold.ui
+++ b/tests/manual/uiloader/baseline/pagefold.ui
diff --git a/tests/auto/uiloader/baseline/paletteeditor.ui b/tests/manual/uiloader/baseline/paletteeditor.ui
index a164fc589..a164fc589 100644
--- a/tests/auto/uiloader/baseline/paletteeditor.ui
+++ b/tests/manual/uiloader/baseline/paletteeditor.ui
diff --git a/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui b/tests/manual/uiloader/baseline/paletteeditoradvancedbase.ui
index efc63e5b4..efc63e5b4 100644
--- a/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
+++ b/tests/manual/uiloader/baseline/paletteeditoradvancedbase.ui
diff --git a/tests/auto/uiloader/baseline/passworddialog.ui b/tests/manual/uiloader/baseline/passworddialog.ui
index 7c1665867..7c1665867 100644
--- a/tests/auto/uiloader/baseline/passworddialog.ui
+++ b/tests/manual/uiloader/baseline/passworddialog.ui
diff --git a/tests/auto/uiloader/baseline/pathpage.ui b/tests/manual/uiloader/baseline/pathpage.ui
index 89083915d..89083915d 100644
--- a/tests/auto/uiloader/baseline/pathpage.ui
+++ b/tests/manual/uiloader/baseline/pathpage.ui
diff --git a/tests/auto/uiloader/baseline/phrasebookbox.ui b/tests/manual/uiloader/baseline/phrasebookbox.ui
index 34d09d13e..34d09d13e 100644
--- a/tests/auto/uiloader/baseline/phrasebookbox.ui
+++ b/tests/manual/uiloader/baseline/phrasebookbox.ui
diff --git a/tests/auto/uiloader/baseline/plugindialog.ui b/tests/manual/uiloader/baseline/plugindialog.ui
index ca454ca66..ca454ca66 100644
--- a/tests/auto/uiloader/baseline/plugindialog.ui
+++ b/tests/manual/uiloader/baseline/plugindialog.ui
diff --git a/tests/auto/uiloader/baseline/preferencesdialog.ui b/tests/manual/uiloader/baseline/preferencesdialog.ui
index 3092fcb53..3092fcb53 100644
--- a/tests/auto/uiloader/baseline/preferencesdialog.ui
+++ b/tests/manual/uiloader/baseline/preferencesdialog.ui
diff --git a/tests/auto/uiloader/baseline/previewconfigurationwidget.ui b/tests/manual/uiloader/baseline/previewconfigurationwidget.ui
index 2f18766ff..2f18766ff 100644
--- a/tests/auto/uiloader/baseline/previewconfigurationwidget.ui
+++ b/tests/manual/uiloader/baseline/previewconfigurationwidget.ui
diff --git a/tests/auto/uiloader/baseline/previewdialogbase.ui b/tests/manual/uiloader/baseline/previewdialogbase.ui
index 593ee3357..593ee3357 100644
--- a/tests/auto/uiloader/baseline/previewdialogbase.ui
+++ b/tests/manual/uiloader/baseline/previewdialogbase.ui
diff --git a/tests/auto/uiloader/baseline/previewwidget.ui b/tests/manual/uiloader/baseline/previewwidget.ui
index 0f30ed6f7..0f30ed6f7 100644
--- a/tests/auto/uiloader/baseline/previewwidget.ui
+++ b/tests/manual/uiloader/baseline/previewwidget.ui
diff --git a/tests/auto/uiloader/baseline/previewwidgetbase.ui b/tests/manual/uiloader/baseline/previewwidgetbase.ui
index 40035ef09..40035ef09 100644
--- a/tests/auto/uiloader/baseline/previewwidgetbase.ui
+++ b/tests/manual/uiloader/baseline/previewwidgetbase.ui
diff --git a/tests/auto/uiloader/baseline/proxy.ui b/tests/manual/uiloader/baseline/proxy.ui
index 62a8be627..62a8be627 100644
--- a/tests/auto/uiloader/baseline/proxy.ui
+++ b/tests/manual/uiloader/baseline/proxy.ui
diff --git a/tests/auto/uiloader/baseline/qfiledialog.ui b/tests/manual/uiloader/baseline/qfiledialog.ui
index d96e808f0..d96e808f0 100644
--- a/tests/auto/uiloader/baseline/qfiledialog.ui
+++ b/tests/manual/uiloader/baseline/qfiledialog.ui
diff --git a/tests/auto/uiloader/baseline/qpagesetupwidget.ui b/tests/manual/uiloader/baseline/qpagesetupwidget.ui
index ace2ab8f4..ace2ab8f4 100644
--- a/tests/auto/uiloader/baseline/qpagesetupwidget.ui
+++ b/tests/manual/uiloader/baseline/qpagesetupwidget.ui
diff --git a/tests/auto/uiloader/baseline/qprintpropertieswidget.ui b/tests/manual/uiloader/baseline/qprintpropertieswidget.ui
index 26fa09599..26fa09599 100644
--- a/tests/auto/uiloader/baseline/qprintpropertieswidget.ui
+++ b/tests/manual/uiloader/baseline/qprintpropertieswidget.ui
diff --git a/tests/auto/uiloader/baseline/qprintsettingsoutput.ui b/tests/manual/uiloader/baseline/qprintsettingsoutput.ui
index de8f4faee..de8f4faee 100644
--- a/tests/auto/uiloader/baseline/qprintsettingsoutput.ui
+++ b/tests/manual/uiloader/baseline/qprintsettingsoutput.ui
diff --git a/tests/auto/uiloader/baseline/qprintwidget.ui b/tests/manual/uiloader/baseline/qprintwidget.ui
index 8a4f3bde0..8a4f3bde0 100644
--- a/tests/auto/uiloader/baseline/qprintwidget.ui
+++ b/tests/manual/uiloader/baseline/qprintwidget.ui
diff --git a/tests/auto/uiloader/baseline/qsqlconnectiondialog.ui b/tests/manual/uiloader/baseline/qsqlconnectiondialog.ui
index 91a870057..91a870057 100644
--- a/tests/auto/uiloader/baseline/qsqlconnectiondialog.ui
+++ b/tests/manual/uiloader/baseline/qsqlconnectiondialog.ui
diff --git a/tests/auto/uiloader/baseline/qtgradientdialog.ui b/tests/manual/uiloader/baseline/qtgradientdialog.ui
index 487ff806c..487ff806c 100644
--- a/tests/auto/uiloader/baseline/qtgradientdialog.ui
+++ b/tests/manual/uiloader/baseline/qtgradientdialog.ui
diff --git a/tests/auto/uiloader/baseline/qtgradienteditor.ui b/tests/manual/uiloader/baseline/qtgradienteditor.ui
index c149d886b..c149d886b 100644
--- a/tests/auto/uiloader/baseline/qtgradienteditor.ui
+++ b/tests/manual/uiloader/baseline/qtgradienteditor.ui
diff --git a/tests/auto/uiloader/baseline/qtgradientview.ui b/tests/manual/uiloader/baseline/qtgradientview.ui
index af7267ea2..af7267ea2 100644
--- a/tests/auto/uiloader/baseline/qtgradientview.ui
+++ b/tests/manual/uiloader/baseline/qtgradientview.ui
diff --git a/tests/auto/uiloader/baseline/qtgradientviewdialog.ui b/tests/manual/uiloader/baseline/qtgradientviewdialog.ui
index a14ed88d7..a14ed88d7 100644
--- a/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
+++ b/tests/manual/uiloader/baseline/qtgradientviewdialog.ui
diff --git a/tests/auto/uiloader/baseline/qtresourceeditordialog.ui b/tests/manual/uiloader/baseline/qtresourceeditordialog.ui
index 2205da4d5..2205da4d5 100644
--- a/tests/auto/uiloader/baseline/qtresourceeditordialog.ui
+++ b/tests/manual/uiloader/baseline/qtresourceeditordialog.ui
diff --git a/tests/auto/uiloader/baseline/qttoolbardialog.ui b/tests/manual/uiloader/baseline/qttoolbardialog.ui
index c4ad934f8..c4ad934f8 100644
--- a/tests/auto/uiloader/baseline/qttoolbardialog.ui
+++ b/tests/manual/uiloader/baseline/qttoolbardialog.ui
diff --git a/tests/auto/uiloader/baseline/querywidget.ui b/tests/manual/uiloader/baseline/querywidget.ui
index 53fa62227..53fa62227 100644
--- a/tests/auto/uiloader/baseline/querywidget.ui
+++ b/tests/manual/uiloader/baseline/querywidget.ui
diff --git a/tests/auto/uiloader/baseline/remotecontrol.ui b/tests/manual/uiloader/baseline/remotecontrol.ui
index 1cfc7f540..1cfc7f540 100644
--- a/tests/auto/uiloader/baseline/remotecontrol.ui
+++ b/tests/manual/uiloader/baseline/remotecontrol.ui
diff --git a/tests/auto/uiloader/baseline/saveformastemplate.ui b/tests/manual/uiloader/baseline/saveformastemplate.ui
index 6e5510aca..6e5510aca 100644
--- a/tests/auto/uiloader/baseline/saveformastemplate.ui
+++ b/tests/manual/uiloader/baseline/saveformastemplate.ui
diff --git a/tests/auto/uiloader/baseline/settings.ui b/tests/manual/uiloader/baseline/settings.ui
index fcf698ba8..fcf698ba8 100644
--- a/tests/auto/uiloader/baseline/settings.ui
+++ b/tests/manual/uiloader/baseline/settings.ui
diff --git a/tests/auto/uiloader/baseline/signalslotdialog.ui b/tests/manual/uiloader/baseline/signalslotdialog.ui
index 1a8a8d921..1a8a8d921 100644
--- a/tests/auto/uiloader/baseline/signalslotdialog.ui
+++ b/tests/manual/uiloader/baseline/signalslotdialog.ui
diff --git a/tests/auto/uiloader/baseline/sslclient.ui b/tests/manual/uiloader/baseline/sslclient.ui
index 5a2475116..5a2475116 100644
--- a/tests/auto/uiloader/baseline/sslclient.ui
+++ b/tests/manual/uiloader/baseline/sslclient.ui
diff --git a/tests/auto/uiloader/baseline/sslerrors.ui b/tests/manual/uiloader/baseline/sslerrors.ui
index 4aac18cdd..4aac18cdd 100644
--- a/tests/auto/uiloader/baseline/sslerrors.ui
+++ b/tests/manual/uiloader/baseline/sslerrors.ui
diff --git a/tests/auto/uiloader/baseline/statistics.ui b/tests/manual/uiloader/baseline/statistics.ui
index f5ccdb86d..f5ccdb86d 100644
--- a/tests/auto/uiloader/baseline/statistics.ui
+++ b/tests/manual/uiloader/baseline/statistics.ui
diff --git a/tests/auto/uiloader/baseline/stringlisteditor.ui b/tests/manual/uiloader/baseline/stringlisteditor.ui
index b639e31bf..b639e31bf 100644
--- a/tests/auto/uiloader/baseline/stringlisteditor.ui
+++ b/tests/manual/uiloader/baseline/stringlisteditor.ui
diff --git a/tests/auto/uiloader/baseline/stylesheeteditor.ui b/tests/manual/uiloader/baseline/stylesheeteditor.ui
index 34cd7f6d0..34cd7f6d0 100644
--- a/tests/auto/uiloader/baseline/stylesheeteditor.ui
+++ b/tests/manual/uiloader/baseline/stylesheeteditor.ui
diff --git a/tests/auto/uiloader/baseline/tabbedbrowser.ui b/tests/manual/uiloader/baseline/tabbedbrowser.ui
index 177a46ee6..177a46ee6 100644
--- a/tests/auto/uiloader/baseline/tabbedbrowser.ui
+++ b/tests/manual/uiloader/baseline/tabbedbrowser.ui
diff --git a/tests/auto/uiloader/baseline/tablewidgeteditor.ui b/tests/manual/uiloader/baseline/tablewidgeteditor.ui
index dcdaefc8c..dcdaefc8c 100644
--- a/tests/auto/uiloader/baseline/tablewidgeteditor.ui
+++ b/tests/manual/uiloader/baseline/tablewidgeteditor.ui
diff --git a/tests/auto/uiloader/baseline/tetrixwindow.ui b/tests/manual/uiloader/baseline/tetrixwindow.ui
index a13f538aa..a13f538aa 100644
--- a/tests/auto/uiloader/baseline/tetrixwindow.ui
+++ b/tests/manual/uiloader/baseline/tetrixwindow.ui
diff --git a/tests/auto/uiloader/baseline/textfinder.ui b/tests/manual/uiloader/baseline/textfinder.ui
index af05192db..af05192db 100644
--- a/tests/auto/uiloader/baseline/textfinder.ui
+++ b/tests/manual/uiloader/baseline/textfinder.ui
diff --git a/tests/auto/uiloader/baseline/topicchooser.ui b/tests/manual/uiloader/baseline/topicchooser.ui
index d4c90bb4b..d4c90bb4b 100644
--- a/tests/auto/uiloader/baseline/topicchooser.ui
+++ b/tests/manual/uiloader/baseline/topicchooser.ui
diff --git a/tests/auto/uiloader/baseline/translatedialog.ui b/tests/manual/uiloader/baseline/translatedialog.ui
index 60c2151ab..60c2151ab 100644
--- a/tests/auto/uiloader/baseline/translatedialog.ui
+++ b/tests/manual/uiloader/baseline/translatedialog.ui
diff --git a/tests/auto/uiloader/baseline/translationsettings.ui b/tests/manual/uiloader/baseline/translationsettings.ui
index 4bd4be9e0..4bd4be9e0 100644
--- a/tests/auto/uiloader/baseline/translationsettings.ui
+++ b/tests/manual/uiloader/baseline/translationsettings.ui
diff --git a/tests/auto/uiloader/baseline/treewidgeteditor.ui b/tests/manual/uiloader/baseline/treewidgeteditor.ui
index a88396d38..a88396d38 100644
--- a/tests/auto/uiloader/baseline/treewidgeteditor.ui
+++ b/tests/manual/uiloader/baseline/treewidgeteditor.ui
diff --git a/tests/auto/uiloader/baseline/trpreviewtool.ui b/tests/manual/uiloader/baseline/trpreviewtool.ui
index 0c658ce28..0c658ce28 100644
--- a/tests/auto/uiloader/baseline/trpreviewtool.ui
+++ b/tests/manual/uiloader/baseline/trpreviewtool.ui
diff --git a/tests/auto/uiloader/baseline/validators.ui b/tests/manual/uiloader/baseline/validators.ui
index f05b96fbe..f05b96fbe 100644
--- a/tests/auto/uiloader/baseline/validators.ui
+++ b/tests/manual/uiloader/baseline/validators.ui
diff --git a/tests/auto/uiloader/baseline/wateringconfigdialog.ui b/tests/manual/uiloader/baseline/wateringconfigdialog.ui
index a7f5349d7..a7f5349d7 100644
--- a/tests/auto/uiloader/baseline/wateringconfigdialog.ui
+++ b/tests/manual/uiloader/baseline/wateringconfigdialog.ui
diff --git a/tests/auto/uiloader/desert.ini b/tests/manual/uiloader/desert.ini
index 799b22449..799b22449 100644
--- a/tests/auto/uiloader/desert.ini
+++ b/tests/manual/uiloader/desert.ini
diff --git a/tests/auto/uiloader/dole.ini b/tests/manual/uiloader/dole.ini
index 799b22449..799b22449 100644
--- a/tests/auto/uiloader/dole.ini
+++ b/tests/manual/uiloader/dole.ini
diff --git a/tests/auto/uiloader/gravlaks.ini b/tests/manual/uiloader/gravlaks.ini
index 3a11cf2a4..3a11cf2a4 100644
--- a/tests/auto/uiloader/gravlaks.ini
+++ b/tests/manual/uiloader/gravlaks.ini
diff --git a/tests/auto/uiloader/jackychan.ini b/tests/manual/uiloader/jackychan.ini
index 799b22449..799b22449 100644
--- a/tests/auto/uiloader/jackychan.ini
+++ b/tests/manual/uiloader/jackychan.ini
diff --git a/tests/auto/uiloader/jeunehomme.ini b/tests/manual/uiloader/jeunehomme.ini
index 799b22449..799b22449 100644
--- a/tests/auto/uiloader/jeunehomme.ini
+++ b/tests/manual/uiloader/jeunehomme.ini
diff --git a/tests/auto/uiloader/kangaroo.ini b/tests/manual/uiloader/kangaroo.ini
index 799b22449..799b22449 100644
--- a/tests/auto/uiloader/kangaroo.ini
+++ b/tests/manual/uiloader/kangaroo.ini
diff --git a/tests/auto/uiloader/kayak.ini b/tests/manual/uiloader/kayak.ini
index 751a3883f..751a3883f 100644
--- a/tests/auto/uiloader/kayak.ini
+++ b/tests/manual/uiloader/kayak.ini
diff --git a/tests/auto/uiloader/scruffy.ini b/tests/manual/uiloader/scruffy.ini
index 799b22449..799b22449 100644
--- a/tests/auto/uiloader/scruffy.ini
+++ b/tests/manual/uiloader/scruffy.ini
diff --git a/tests/auto/uiloader/troll15.ini b/tests/manual/uiloader/troll15.ini
index 57f5cd826..57f5cd826 100644
--- a/tests/auto/uiloader/troll15.ini
+++ b/tests/manual/uiloader/troll15.ini
diff --git a/tests/manual/uiloader/tst_screenshot/README.TXT b/tests/manual/uiloader/tst_screenshot/README.TXT
new file mode 100644
index 000000000..ae0117098
--- /dev/null
+++ b/tests/manual/uiloader/tst_screenshot/README.TXT
@@ -0,0 +1,13 @@
+This program is called from ../uiloader.
+
+
+./tst_screenshot
+
+    Syntax: ./tst_screenshot <path to *.ui file> [output directory]
+
+    This program takes a *.ui file and an output dir as argument in order to
+    create a screenshot of the widget defined in the ui file.
+
+    The screenshot is saved in the output dir (default current dir), ".png" is
+    appended to the ui file name.
+
diff --git a/tests/manual/uiloader/tst_screenshot/main.cpp b/tests/manual/uiloader/tst_screenshot/main.cpp
new file mode 100644
index 000000000..82f6ed76c
--- /dev/null
+++ b/tests/manual/uiloader/tst_screenshot/main.cpp
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 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$
+**
+****************************************************************************/
+
+/*
+ * This program takes a *.ui file and an output dir as argument in order to
+ * create a screenshot of the widget defined in the ui file.
+ *
+ * The screenshot is saved in the output dir (default current dir), ".png" is
+ * appended to the ui file name.
+ */
+
+#include <QApplication>
+#include <QWidget>
+#include <QFile>
+#include <QDebug>
+
+#include <QDir>
+
+#include <iostream>
+
+using namespace std;
+
+
+#ifdef Q_WS_QWS
+// we don't compile designer on embedded...
+
+int main(int argc, char **argv)
+{
+    return 0;
+}
+
+
+#else
+
+#include <QUiLoader>
+
+/*
+ * Take the path of an ui file and return appropriate QWidget.
+ */
+
+QWidget* getWidgetFromUiFile(const QString& fileNameUiFile)
+{
+    qDebug() << "\t\t\t...loading ui file" << fileNameUiFile;
+
+    QUiLoader loader;
+    QFile uiFile(fileNameUiFile);
+    if (!uiFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+               qDebug("\t\tError: QFile.open() failed.");
+               exit(EXIT_FAILURE);
+       }
+
+    QFileInfo fileInfo(fileNameUiFile);
+    QDir::setCurrent(fileInfo.absolutePath()); //for the stylesheet to find their images
+
+    QWidget *ui = loader.load(&uiFile);
+       if (!ui) {
+               qDebug("\t\tError: Quilodader.load() returned NULL pointer.");
+               exit(EXIT_FAILURE);
+       }
+    uiFile.close();
+
+    return ui;
+}
+
+
+
+/*
+ * Takes the actual screenshot.
+ *
+ * Hint: provide filename without extension, ".png" will be added
+ */
+
+void makeScreenshot(QWidget* widget, const QString& fileName, const QString& pathOutputDir)
+{
+    QFileInfo fileInfo(fileName);
+    QString realFileName = fileInfo.completeBaseName() + "." + fileInfo.suffix() + ".png";
+    QString realPath = pathOutputDir + "/" + realFileName;
+
+
+    //QString realFileName = fileName + ".png";
+    qDebug() << "\t\t\t...Taking screenshot" << fileInfo.absoluteFilePath();
+
+    //widget->show();
+    qApp->processEvents();
+    QImage originalPixmap(widget->size(),QImage::Format_ARGB32);
+    widget->render(&originalPixmap);
+       if ( originalPixmap.isNull() ) {
+               qDebug("\t\tError: QPixmap::grabWidget() returned a NULL QPixmap.");
+               exit(EXIT_FAILURE);
+       }
+    //QString fileName = QDir::currentPath() + "/secondwidget." + format;
+    if ( !originalPixmap.save(realPath, "PNG") ) {
+               qDebug("\t\tError: QPixmap.save() failed.");
+               exit(EXIT_FAILURE);
+       }
+    qDebug() << "\t\t\t...Screenshot saved in" << realPath;
+
+    widget->close();
+}
+
+
+
+/*
+ * Call this if you just want to pass the ui file name and the output dir.
+ */
+
+void createScreenshotFromUiFile(const QString& fileNameUiFile, const QString pathOutputDir)
+{
+    qDebug() << "\t\tCreating screenshot from widget defined in" << fileNameUiFile;
+
+    QWidget* w = getWidgetFromUiFile(fileNameUiFile);
+    makeScreenshot(w, fileNameUiFile, pathOutputDir);
+}
+
+
+
+/*
+ * Start here.
+ */
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    // check for necessary arguments
+    if (argc == 1) {
+        cout << "Syntax: " << argv[0] << " <path to *.ui file> [output directory]" << endl;
+        cout << "" << endl;
+        cout << "Takes a *.ui file and an output dir as argument in order to" << endl;
+        cout << "create a screenshot of the widget defined in the ui file." << endl;
+        cout << "" << endl;
+        cout << "The screenshot is saved in the output dir (default current dir)," << endl;
+        cout << "'.png' is appended to the ui file name." << endl;
+        exit(EXIT_FAILURE);
+    }
+
+
+    // check for *.ui
+    QString fileName = app.arguments().value(1);
+    if ( !fileName.endsWith(".ui") ) {
+        qDebug() << fileName + " is not a *.ui file.";
+        exit(EXIT_FAILURE);
+    }
+
+    // does the file exist?
+    QFile uiFile(fileName);
+    if ( !uiFile.exists() ) {
+        qDebug() << fileName + " does not exist.";
+        exit(EXIT_FAILURE);
+    }
+
+    // check output directory
+    QString pathOutputDir = QDir::currentPath();
+
+    if (argc >= 3 ) {
+        QDir outputDir = app.arguments().value(2);
+        if ( outputDir.exists() ) {
+            pathOutputDir = outputDir.absolutePath();
+        } else {
+            qDebug() << outputDir.absolutePath() + " does not exist or is not a directory.";
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    // take the screenshot
+    createScreenshotFromUiFile(fileName, pathOutputDir);
+
+    app.quit();
+    return 0;
+}
+
+#endif
diff --git a/tests/manual/uiloader/tst_screenshot/tst_screenshot.pro b/tests/manual/uiloader/tst_screenshot/tst_screenshot.pro
new file mode 100644
index 000000000..fc2af03f9
--- /dev/null
+++ b/tests/manual/uiloader/tst_screenshot/tst_screenshot.pro
@@ -0,0 +1,8 @@
+TARGET       = tst_screenshot
+TEMPLATE     = app
+
+QT          += widgets
+SOURCES     += main.cpp
+
+!embedded:QT += uitools
+
diff --git a/tests/auto/uiloader/tundra.ini b/tests/manual/uiloader/tundra.ini
index 799b22449..799b22449 100644
--- a/tests/auto/uiloader/tundra.ini
+++ b/tests/manual/uiloader/tundra.ini
diff --git a/tests/auto/uiloader/uiloader.pro b/tests/manual/uiloader/uiloader.pro
index 30ecb2fa1..30ecb2fa1 100644
--- a/tests/auto/uiloader/uiloader.pro
+++ b/tests/manual/uiloader/uiloader.pro
diff --git a/tests/auto/uiloader/uiloader/tst_uiloader.cpp b/tests/manual/uiloader/uiloader/tst_uiloader.cpp
index 4bc92e14c..4bc92e14c 100644
--- a/tests/auto/uiloader/uiloader/tst_uiloader.cpp
+++ b/tests/manual/uiloader/uiloader/tst_uiloader.cpp
diff --git a/tests/auto/uiloader/uiloader/uiloader.cpp b/tests/manual/uiloader/uiloader/uiloader.cpp
index 1e98ce298..3cf9ae282 100644
--- a/tests/auto/uiloader/uiloader/uiloader.cpp
+++ b/tests/manual/uiloader/uiloader/uiloader.cpp
@@ -53,7 +53,6 @@
 #include <QString>
 #include <QHash>
 #include <QFile>
-#include <QFtp>
 #include <QObject>
 #include <QHostInfo>
 #include <QWidget>
@@ -61,6 +60,8 @@
 
 #include <QLibraryInfo>
 
+#include <private/qurlinfo_p.h>
+#include <private/qftp_p.h>
 
 /*
  * Our own QVERIFY since the one from QTest can't be used in non-void functions.
@@ -143,7 +144,7 @@ bool uiLoader::loadConfig(const QString &filePath, QString *errorMessage)
     settings.endArray();
 
     output = settings.value(QLatin1String("output")).toString();
-    output += QDir::separator() + QLibraryInfo::buildKey() + QDir::separator() + QString( qVersion() );
+    output += QDir::separator() + QString("QLibraryInfo::buildKey()") + QDir::separator() + QString( qVersion() );
     ftpUser = settings.value( QLatin1String("ftpUser") ).toString();
     ftpPass = settings.value( QLatin1String("ftpPass") ).toString();
     ftpHost = settings.value( QLatin1String("ftpHost") ).toString();
@@ -330,7 +331,7 @@ void uiLoader::setupFTP()
 
     // create dirs on ftp server
     ftpMkDir( ftpBaseDir );
-    ftpBaseDir += "/" + QLibraryInfo::buildKey();
+    ftpBaseDir += "/" + QString("QLibraryInfo::buildKey()");
     ftpMkDir( ftpBaseDir );
     ftpBaseDir += "/" + QString( qVersion() );
     ftpMkDir( ftpBaseDir );
@@ -716,7 +717,7 @@ uiLoader::TestResult uiLoader::runAutoTests(QString *errorMessage)
     // SVG needs this widget...
     QWidget dummy;
 
-    qDebug() << "Running test on buildkey:" << QLibraryInfo::buildKey() << "  qt version:" << qVersion();
+    qDebug() << "Running test on buildkey:" << "QLibraryInfo::buildKey()" << "  qt version:" << qVersion();
     qDebug() << "Initializing tests...";
 
     // load config
diff --git a/tests/auto/uiloader/uiloader/uiloader.h b/tests/manual/uiloader/uiloader/uiloader.h
index 99f7704ad..95b42c2d5 100644
--- a/tests/auto/uiloader/uiloader/uiloader.h
+++ b/tests/manual/uiloader/uiloader/uiloader.h
@@ -43,10 +43,11 @@
 
 #include <QHash>
 #include <QString>
-#include <QUrlInfo>
 #include <QList>
 #include <QImage>
 
+#include <private/qurlinfo_p.h>
+
 class uiLoader : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/uiloader/uiloader/uiloader.pro b/tests/manual/uiloader/uiloader/uiloader.pro
index cc291bcc3..ee6c4878c 100644
--- a/tests/auto/uiloader/uiloader/uiloader.pro
+++ b/tests/manual/uiloader/uiloader/uiloader.pro
@@ -1,5 +1,6 @@
-QT += widgets network testlib
-CONFIG += testcase
+requires(contains(QT_CONFIG,private_tests))
+QT += network network-private testlib
+qtHaveModule(widgets): QT += widgets
 
 TEMPLATE = app
 !embedded:QT += uitools
diff --git a/tests/auto/uiloader/wartburg.ini b/tests/manual/uiloader/wartburg.ini
index 751a3883f..751a3883f 100644
--- a/tests/auto/uiloader/wartburg.ini
+++ b/tests/manual/uiloader/wartburg.ini