From d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 11 Jan 2012 10:03:25 +0100
Subject: Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3
 (http://svn.webkit.org/repository/webkit/trunk@104681)

---
 Tools/QtTestBrowser/QtTestBrowser.pro |  2 --
 Tools/QtTestBrowser/launcherwindow.h  |  4 ----
 Tools/QtTestBrowser/webpage.cpp       | 11 +++++------
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'Tools/QtTestBrowser')

diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro
index 8825b2152..3147ddae0 100644
--- a/Tools/QtTestBrowser/QtTestBrowser.pro
+++ b/Tools/QtTestBrowser/QtTestBrowser.pro
@@ -35,8 +35,6 @@ HEADERS += \
     cookiejar.h
 
 
-CONFIG += uitools
-
 WEBKIT += webcore
 
 CONFIG += qtwebkit
diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h
index 94452605a..3495bada8 100644
--- a/Tools/QtTestBrowser/launcherwindow.h
+++ b/Tools/QtTestBrowser/launcherwindow.h
@@ -43,10 +43,6 @@
 #include <QPrintPreviewDialog>
 #endif
 
-#ifndef QT_NO_UITOOLS
-#include <QtUiTools/QUiLoader>
-#endif
-
 #include <QDebug>
 
 #include <cstdio>
diff --git a/Tools/QtTestBrowser/webpage.cpp b/Tools/QtTestBrowser/webpage.cpp
index 98b7d0a74..a4bc78f8f 100644
--- a/Tools/QtTestBrowser/webpage.cpp
+++ b/Tools/QtTestBrowser/webpage.cpp
@@ -47,6 +47,7 @@
 #ifndef QT_NO_LINEEDIT
 #include <QLineEdit>
 #endif
+#include <QProgressBar>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkProxy>
@@ -209,12 +210,10 @@ QObject* WebPage::createPlugin(const QString &classId, const QUrl&, const QStrin
         return l;
     }
 
-#ifndef QT_NO_UITOOLS
-    QUiLoader loader;
-    return loader.createWidget(classId, view());
-#else
-    Q_UNUSED(classId);
+    if (classId == QLatin1String("QProgressBar"))
+        return new QProgressBar(view());
+    if (classId == QLatin1String("QLabel"))
+        return new QLabel(view());
     return 0;
-#endif
 }
 
-- 
cgit v1.2.1