diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Tools/QtTestBrowser | |
parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
Diffstat (limited to 'Tools/QtTestBrowser')
-rw-r--r-- | Tools/QtTestBrowser/QtTestBrowser.pro | 2 | ||||
-rw-r--r-- | Tools/QtTestBrowser/qttestbrowser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro index f69606ab9..60d1b4f3f 100644 --- a/Tools/QtTestBrowser/QtTestBrowser.pro +++ b/Tools/QtTestBrowser/QtTestBrowser.pro @@ -42,7 +42,7 @@ WEBKIT += wtf webcore DESTDIR = $$ROOT_BUILD_DIR/bin -QT += network webkitwidgets widgets +QT += network webkit widgets have?(QTPRINTSUPPORT): QT += printsupport macx:QT += xml diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index 64cb26153..ab4bc70d4 100644 --- a/Tools/QtTestBrowser/qttestbrowser.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -300,7 +300,7 @@ int main(int argc, char **argv) if (QFile(defaultIndexFile).exists()) urls.append(QString("file://") + defaultIndexFile); else - urls.append("http://www.google.com/"); + urls.append(""); } LauncherWindow* window = 0; |