Diff
Modified: trunk/Tools/ChangeLog (120165 => 120166)
--- trunk/Tools/ChangeLog 2012-06-13 06:50:19 UTC (rev 120165)
+++ trunk/Tools/ChangeLog 2012-06-13 07:32:58 UTC (rev 120166)
@@ -1,3 +1,27 @@
+2012-06-13 Joel Dillon <[email protected]>
+
+ [Qt][Win]QtTestBrowser somehow picks up DumpRenderTree's main.cpp, causing a failure to link
+ https://bugs.webkit.org/show_bug.cgi?id=88874
+
+ Reviewed by Simon Hausmann.
+
+ Rename main.cpp in QtTestBrowser because on Windows
+ it conflicts with main.cpp from DumpRenderTree.
+
+ * QtTestBrowser/QtTestBrowser.pro:
+ * QtTestBrowser/qttestbrowser.cpp: Renamed from Tools/QtTestBrowser/main.cpp.
+ (launcherMain):
+ (LauncherApplication):
+ (LauncherApplication::urls):
+ (LauncherApplication::isRobotized):
+ (LauncherApplication::robotTimeout):
+ (LauncherApplication::robotExtraTime):
+ (LauncherApplication::applyDefaultSettings):
+ (LauncherApplication::LauncherApplication):
+ (requiresGraphicsView):
+ (LauncherApplication::handleUserOptions):
+ (main):
+
2012-06-12 Lucas Forschler <[email protected]>
Wrap bot types inside ().
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (120165 => 120166)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-06-13 06:50:19 UTC (rev 120165)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-06-13 07:32:58 UTC (rev 120166)
@@ -17,7 +17,7 @@
$${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \
locationedit.cpp \
launcherwindow.cpp \
- main.cpp \
+ qttestbrowser.cpp \
mainwindow.cpp \
urlloader.cpp \
utils.cpp \
Deleted: trunk/Tools/QtTestBrowser/main.cpp (120165 => 120166)
--- trunk/Tools/QtTestBrowser/main.cpp 2012-06-13 06:50:19 UTC (rev 120165)
+++ trunk/Tools/QtTestBrowser/main.cpp 2012-06-13 07:32:58 UTC (rev 120166)
@@ -1,321 +0,0 @@
-/*
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Girish Ramakrishnan <[email protected]>
- * Copyright (C) 2006 George Staikos <[email protected]>
- * Copyright (C) 2006 Dirk Mueller <[email protected]>
- * Copyright (C) 2006 Zack Rusin <[email protected]>
- * Copyright (C) 2006 Simon Hausmann <[email protected]>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "DumpRenderTreeSupportQt.h"
-#include "QtInitializeTestFonts.h"
-#include "launcherwindow.h"
-#include "urlloader.h"
-
-WindowOptions windowOptions;
-
-#include <QApplication>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QFontDatabase>
-
-int launcherMain(const QApplication& app)
-{
-#ifndef NDEBUG
- int retVal = app.exec();
- DumpRenderTreeSupportQt::garbageCollectorCollect();
- QWebSettings::clearMemoryCaches();
- return retVal;
-#else
- return app.exec();
-#endif
-}
-
-class LauncherApplication : public QApplication {
- Q_OBJECT
-
-public:
- LauncherApplication(int& argc, char** argv);
- QStringList urls() const { return m_urls; }
- bool isRobotized() const { return m_isRobotized; }
- int robotTimeout() const { return m_robotTimeoutSeconds; }
- int robotExtraTime() const { return m_robotExtraTimeSeconds; }
-
-private:
- void handleUserOptions();
- void applyDefaultSettings();
-
-private:
- bool m_isRobotized;
- int m_robotTimeoutSeconds;
- int m_robotExtraTimeSeconds;
- QStringList m_urls;
-};
-
-void LauncherApplication::applyDefaultSettings()
-{
- QWebSettings::setMaximumPagesInCache(4);
-
- QWebSettings::setObjectCacheCapacities((16*1024*1024) / 8, (16*1024*1024) / 8, 16*1024*1024);
-
- QWebSettings::globalSettings()->setAttribute(QWebSettings::PluginsEnabled, true);
- QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
- QWebSettings::enablePersistentStorage();
-}
-
-LauncherApplication::LauncherApplication(int& argc, char** argv)
- : QApplication(argc, argv, QApplication::GuiServer)
- , m_isRobotized(false)
- , m_robotTimeoutSeconds(0)
- , m_robotExtraTimeSeconds(0)
-{
- // To allow QWebInspector's configuration persistence
- setOrganizationName("Nokia");
- setApplicationName("QtTestBrowser");
- setApplicationVersion("0.1");
-
- applyDefaultSettings();
-
- handleUserOptions();
-}
-
-static void requiresGraphicsView(const QString& option)
-{
- if (windowOptions.useGraphicsView)
- return;
- appQuit(1, QString("%1 only works in combination with the -graphicsbased option").arg(option));
-}
-
-void LauncherApplication::handleUserOptions()
-{
- QStringList args = arguments();
- QFileInfo program(args.at(0));
- QString programName("QtTestBrowser");
- if (program.exists())
- programName = program.baseName();
-
- QList<QString> updateModes(enumToKeys(QGraphicsView::staticMetaObject,
- "ViewportUpdateMode", "ViewportUpdate"));
-
- if (args.contains("-help")) {
- qDebug() << "Usage:" << programName.toLatin1().data()
- << "[-graphicsbased]"
- << "[-no-compositing]"
-#if defined(QT_CONFIGURED_WITH_OPENGL)
- << "[-gl-viewport]"
- << "[-webgl]"
-#endif
- << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
-#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
- << "[-disk-cache]"
-#endif
- << "[-cache-webview]"
- << "[-maximize]"
- << "[-show-fps]"
- << "[-r list]"
- << "[-robot-timeout seconds]"
- << "[-robot-extra-time seconds]"
- << "[-inspector-url location]"
- << "[-tiled-backing-store]"
- << "[-resizes-to-contents]"
- << "[-local-storage-enabled]"
- << "[-no-disk-cookies]"
- << "[-offline-storage-database-enabled]"
- << "[-offline-web-application-cache-enabled]"
- << "[-set-offline-storage-default-quota maxSize]"
- << "[-use-test-fonts]"
- << "[-print-loaded-urls]"
- << "URLs";
- appQuit(0);
- }
-
- const bool defaultForAnimations = args.contains("-default-animations");
- if (args.contains("-graphicsbased") || defaultForAnimations)
- windowOptions.useGraphicsView = true;
-
- if (args.contains("-no-compositing")) {
- requiresGraphicsView("-no-compositing");
- windowOptions.useCompositing = false;
- }
-
- if (args.contains("-show-fps")) {
- requiresGraphicsView("-show-fps");
- windowOptions.showFrameRate = true;
- }
-
- if (args.contains("-disk-cache")) {
-#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
- windowOptions.useDiskCache = true;
-#else
- appQuit(1, "-disk-cache only works if QNetworkDiskCache and QDesktopServices is enabled in your Qt build.");
-#endif
- }
-
- if (args.contains("-cache-webview") || defaultForAnimations) {
- requiresGraphicsView("-cache-webview");
- windowOptions.cacheWebView = true;
- }
-
- if (args.contains("-tiled-backing-store")) {
- requiresGraphicsView("-tiled-backing-store");
- windowOptions.useTiledBackingStore = true;
- }
-
- if (args.contains("-resizes-to-contents")) {
- requiresGraphicsView("-resizes-to-contents");
- windowOptions.resizesToContents = true;
- }
-
- if (args.contains("-local-storage-enabled"))
- windowOptions.useLocalStorage = true;
-
- if (args.contains("-no-disk-cookies"))
- windowOptions.useDiskCookies = false;
-
- if (args.contains("-maximize"))
- windowOptions.startMaximized = true;
-
- if (args.contains("-offline-storage-database-enabled"))
- windowOptions.useOfflineStorageDatabase = true;
-
- if (args.contains("-offline-web-application-cache-enabled"))
- windowOptions.useOfflineWebApplicationCache = true;
-
- int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota");
- if (setOfflineStorageDefaultQuotaIndex != -1) {
- unsigned int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toUInt();
- windowOptions.offlineStorageDefaultQuotaSize = maxSize;
- }
-
- if (defaultForAnimations)
- windowOptions.viewportUpdateMode = QGraphicsView::BoundingRectViewportUpdate;
-
- QString arg1("-viewport-update-mode");
- int modeIndex = args.indexOf(arg1);
- if (modeIndex != -1) {
- requiresGraphicsView(arg1);
-
- QString mode = takeOptionValue(&args, modeIndex);
- if (mode.isEmpty())
- appQuit(1, QString("%1 needs a value of one of [%2]").arg(arg1).arg(formatKeys(updateModes)));
- int idx = updateModes.indexOf(mode);
- if (idx == -1)
- appQuit(1, QString("%1 value has to be one of [%2]").arg(arg1).arg(formatKeys(updateModes)));
-
- windowOptions.viewportUpdateMode = static_cast<QGraphicsView::ViewportUpdateMode>(idx);
- }
-#ifdef QT_CONFIGURED_WITH_OPENGL
- if (args.contains("-gl-viewport") || defaultForAnimations) {
- requiresGraphicsView("-gl-viewport");
- windowOptions.useQGLWidgetViewport = true;
- }
-
- if (args.contains("-webgl")) {
- requiresGraphicsView("-webgl");
- windowOptions.useWebGL = true;
- }
-#endif
-
- if (args.contains("-use-test-fonts"))
- WebKit::initializeTestFonts();
-
- if (args.contains("-print-loaded-urls"))
- windowOptions.printLoadedUrls = true;
-
- QString inspectorUrlArg("-inspector-url");
- int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
- if (inspectorUrlIndex != -1)
- windowOptions.inspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
-
- QString remoteInspectorPortArg("-remote-inspector-port");
- int remoteInspectorPortIndex = args.indexOf(remoteInspectorPortArg);
- if (remoteInspectorPortIndex != -1)
- windowOptions.remoteInspectorPort = takeOptionValue(&args, remoteInspectorPortIndex).toInt();
-
- int robotIndex = args.indexOf("-r");
- if (robotIndex != -1) {
- QString listFile = takeOptionValue(&args, robotIndex);
- if (listFile.isEmpty())
- appQuit(1, "-r needs a list file to start in robotized mode");
- if (!QFile::exists(listFile))
- appQuit(1, "The list file supplied to -r does not exist.");
-
- m_isRobotized = true;
- m_urls = QStringList(listFile);
- } else {
- int lastArg = args.lastIndexOf(QRegExp("^-.*"));
- m_urls = (lastArg != -1) ? args.mid(++lastArg) : args.mid(1);
- }
-
- int robotTimeoutIndex = args.indexOf("-robot-timeout");
- if (robotTimeoutIndex != -1)
- m_robotTimeoutSeconds = takeOptionValue(&args, robotTimeoutIndex).toInt();
-
- int robotExtraTimeIndex = args.indexOf("-robot-extra-time");
- if (robotExtraTimeIndex != -1)
- m_robotExtraTimeSeconds = takeOptionValue(&args, robotExtraTimeIndex).toInt();
-}
-
-
-int main(int argc, char **argv)
-{
- LauncherApplication app(argc, argv);
-
- if (app.isRobotized()) {
- LauncherWindow* window = new LauncherWindow();
- UrlLoader loader(window->page()->mainFrame(), app.urls().at(0), app.robotTimeout(), app.robotExtraTime());
- loader.loadNext();
- window->show();
- return launcherMain(app);
- }
-
- QStringList urls = app.urls();
-
- if (urls.isEmpty()) {
- QString defaultIndexFile = QString("%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
- if (QFile(defaultIndexFile).exists())
- urls.append(QString("file://") + defaultIndexFile);
- else
- urls.append("");
- }
-
- LauncherWindow* window = 0;
- foreach (QString url, urls) {
- LauncherWindow* newWindow;
- if (!window)
- newWindow = window = new LauncherWindow(&windowOptions);
- else
- newWindow = window->newWindow();
-
- newWindow->load(url);
- }
-
- window->show();
- return launcherMain(app);
-}
-
-#include "main.moc"
Copied: trunk/Tools/QtTestBrowser/qttestbrowser.cpp (from rev 120165, trunk/Tools/QtTestBrowser/main.cpp) (0 => 120166)
--- trunk/Tools/QtTestBrowser/qttestbrowser.cpp (rev 0)
+++ trunk/Tools/QtTestBrowser/qttestbrowser.cpp 2012-06-13 07:32:58 UTC (rev 120166)
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2009 Girish Ramakrishnan <[email protected]>
+ * Copyright (C) 2006 George Staikos <[email protected]>
+ * Copyright (C) 2006 Dirk Mueller <[email protected]>
+ * Copyright (C) 2006 Zack Rusin <[email protected]>
+ * Copyright (C) 2006 Simon Hausmann <[email protected]>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "DumpRenderTreeSupportQt.h"
+#include "QtInitializeTestFonts.h"
+#include "launcherwindow.h"
+#include "urlloader.h"
+
+WindowOptions windowOptions;
+
+#include <QApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFontDatabase>
+
+int launcherMain(const QApplication& app)
+{
+#ifndef NDEBUG
+ int retVal = app.exec();
+ DumpRenderTreeSupportQt::garbageCollectorCollect();
+ QWebSettings::clearMemoryCaches();
+ return retVal;
+#else
+ return app.exec();
+#endif
+}
+
+class LauncherApplication : public QApplication {
+ Q_OBJECT
+
+public:
+ LauncherApplication(int& argc, char** argv);
+ QStringList urls() const { return m_urls; }
+ bool isRobotized() const { return m_isRobotized; }
+ int robotTimeout() const { return m_robotTimeoutSeconds; }
+ int robotExtraTime() const { return m_robotExtraTimeSeconds; }
+
+private:
+ void handleUserOptions();
+ void applyDefaultSettings();
+
+private:
+ bool m_isRobotized;
+ int m_robotTimeoutSeconds;
+ int m_robotExtraTimeSeconds;
+ QStringList m_urls;
+};
+
+void LauncherApplication::applyDefaultSettings()
+{
+ QWebSettings::setMaximumPagesInCache(4);
+
+ QWebSettings::setObjectCacheCapacities((16*1024*1024) / 8, (16*1024*1024) / 8, 16*1024*1024);
+
+ QWebSettings::globalSettings()->setAttribute(QWebSettings::PluginsEnabled, true);
+ QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+ QWebSettings::enablePersistentStorage();
+}
+
+LauncherApplication::LauncherApplication(int& argc, char** argv)
+ : QApplication(argc, argv, QApplication::GuiServer)
+ , m_isRobotized(false)
+ , m_robotTimeoutSeconds(0)
+ , m_robotExtraTimeSeconds(0)
+{
+ // To allow QWebInspector's configuration persistence
+ setOrganizationName("Nokia");
+ setApplicationName("QtTestBrowser");
+ setApplicationVersion("0.1");
+
+ applyDefaultSettings();
+
+ handleUserOptions();
+}
+
+static void requiresGraphicsView(const QString& option)
+{
+ if (windowOptions.useGraphicsView)
+ return;
+ appQuit(1, QString("%1 only works in combination with the -graphicsbased option").arg(option));
+}
+
+void LauncherApplication::handleUserOptions()
+{
+ QStringList args = arguments();
+ QFileInfo program(args.at(0));
+ QString programName("QtTestBrowser");
+ if (program.exists())
+ programName = program.baseName();
+
+ QList<QString> updateModes(enumToKeys(QGraphicsView::staticMetaObject,
+ "ViewportUpdateMode", "ViewportUpdate"));
+
+ if (args.contains("-help")) {
+ qDebug() << "Usage:" << programName.toLatin1().data()
+ << "[-graphicsbased]"
+ << "[-no-compositing]"
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ << "[-gl-viewport]"
+ << "[-webgl]"
+#endif
+ << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
+#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
+ << "[-disk-cache]"
+#endif
+ << "[-cache-webview]"
+ << "[-maximize]"
+ << "[-show-fps]"
+ << "[-r list]"
+ << "[-robot-timeout seconds]"
+ << "[-robot-extra-time seconds]"
+ << "[-inspector-url location]"
+ << "[-tiled-backing-store]"
+ << "[-resizes-to-contents]"
+ << "[-local-storage-enabled]"
+ << "[-no-disk-cookies]"
+ << "[-offline-storage-database-enabled]"
+ << "[-offline-web-application-cache-enabled]"
+ << "[-set-offline-storage-default-quota maxSize]"
+ << "[-use-test-fonts]"
+ << "[-print-loaded-urls]"
+ << "URLs";
+ appQuit(0);
+ }
+
+ const bool defaultForAnimations = args.contains("-default-animations");
+ if (args.contains("-graphicsbased") || defaultForAnimations)
+ windowOptions.useGraphicsView = true;
+
+ if (args.contains("-no-compositing")) {
+ requiresGraphicsView("-no-compositing");
+ windowOptions.useCompositing = false;
+ }
+
+ if (args.contains("-show-fps")) {
+ requiresGraphicsView("-show-fps");
+ windowOptions.showFrameRate = true;
+ }
+
+ if (args.contains("-disk-cache")) {
+#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
+ windowOptions.useDiskCache = true;
+#else
+ appQuit(1, "-disk-cache only works if QNetworkDiskCache and QDesktopServices is enabled in your Qt build.");
+#endif
+ }
+
+ if (args.contains("-cache-webview") || defaultForAnimations) {
+ requiresGraphicsView("-cache-webview");
+ windowOptions.cacheWebView = true;
+ }
+
+ if (args.contains("-tiled-backing-store")) {
+ requiresGraphicsView("-tiled-backing-store");
+ windowOptions.useTiledBackingStore = true;
+ }
+
+ if (args.contains("-resizes-to-contents")) {
+ requiresGraphicsView("-resizes-to-contents");
+ windowOptions.resizesToContents = true;
+ }
+
+ if (args.contains("-local-storage-enabled"))
+ windowOptions.useLocalStorage = true;
+
+ if (args.contains("-no-disk-cookies"))
+ windowOptions.useDiskCookies = false;
+
+ if (args.contains("-maximize"))
+ windowOptions.startMaximized = true;
+
+ if (args.contains("-offline-storage-database-enabled"))
+ windowOptions.useOfflineStorageDatabase = true;
+
+ if (args.contains("-offline-web-application-cache-enabled"))
+ windowOptions.useOfflineWebApplicationCache = true;
+
+ int setOfflineStorageDefaultQuotaIndex = args.indexOf("-set-offline-storage-default-quota");
+ if (setOfflineStorageDefaultQuotaIndex != -1) {
+ unsigned int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toUInt();
+ windowOptions.offlineStorageDefaultQuotaSize = maxSize;
+ }
+
+ if (defaultForAnimations)
+ windowOptions.viewportUpdateMode = QGraphicsView::BoundingRectViewportUpdate;
+
+ QString arg1("-viewport-update-mode");
+ int modeIndex = args.indexOf(arg1);
+ if (modeIndex != -1) {
+ requiresGraphicsView(arg1);
+
+ QString mode = takeOptionValue(&args, modeIndex);
+ if (mode.isEmpty())
+ appQuit(1, QString("%1 needs a value of one of [%2]").arg(arg1).arg(formatKeys(updateModes)));
+ int idx = updateModes.indexOf(mode);
+ if (idx == -1)
+ appQuit(1, QString("%1 value has to be one of [%2]").arg(arg1).arg(formatKeys(updateModes)));
+
+ windowOptions.viewportUpdateMode = static_cast<QGraphicsView::ViewportUpdateMode>(idx);
+ }
+#ifdef QT_CONFIGURED_WITH_OPENGL
+ if (args.contains("-gl-viewport") || defaultForAnimations) {
+ requiresGraphicsView("-gl-viewport");
+ windowOptions.useQGLWidgetViewport = true;
+ }
+
+ if (args.contains("-webgl")) {
+ requiresGraphicsView("-webgl");
+ windowOptions.useWebGL = true;
+ }
+#endif
+
+ if (args.contains("-use-test-fonts"))
+ WebKit::initializeTestFonts();
+
+ if (args.contains("-print-loaded-urls"))
+ windowOptions.printLoadedUrls = true;
+
+ QString inspectorUrlArg("-inspector-url");
+ int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
+ if (inspectorUrlIndex != -1)
+ windowOptions.inspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
+
+ QString remoteInspectorPortArg("-remote-inspector-port");
+ int remoteInspectorPortIndex = args.indexOf(remoteInspectorPortArg);
+ if (remoteInspectorPortIndex != -1)
+ windowOptions.remoteInspectorPort = takeOptionValue(&args, remoteInspectorPortIndex).toInt();
+
+ int robotIndex = args.indexOf("-r");
+ if (robotIndex != -1) {
+ QString listFile = takeOptionValue(&args, robotIndex);
+ if (listFile.isEmpty())
+ appQuit(1, "-r needs a list file to start in robotized mode");
+ if (!QFile::exists(listFile))
+ appQuit(1, "The list file supplied to -r does not exist.");
+
+ m_isRobotized = true;
+ m_urls = QStringList(listFile);
+ } else {
+ int lastArg = args.lastIndexOf(QRegExp("^-.*"));
+ m_urls = (lastArg != -1) ? args.mid(++lastArg) : args.mid(1);
+ }
+
+ int robotTimeoutIndex = args.indexOf("-robot-timeout");
+ if (robotTimeoutIndex != -1)
+ m_robotTimeoutSeconds = takeOptionValue(&args, robotTimeoutIndex).toInt();
+
+ int robotExtraTimeIndex = args.indexOf("-robot-extra-time");
+ if (robotExtraTimeIndex != -1)
+ m_robotExtraTimeSeconds = takeOptionValue(&args, robotExtraTimeIndex).toInt();
+}
+
+
+int main(int argc, char **argv)
+{
+ LauncherApplication app(argc, argv);
+
+ if (app.isRobotized()) {
+ LauncherWindow* window = new LauncherWindow();
+ UrlLoader loader(window->page()->mainFrame(), app.urls().at(0), app.robotTimeout(), app.robotExtraTime());
+ loader.loadNext();
+ window->show();
+ return launcherMain(app);
+ }
+
+ QStringList urls = app.urls();
+
+ if (urls.isEmpty()) {
+ QString defaultIndexFile = QString("%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
+ if (QFile(defaultIndexFile).exists())
+ urls.append(QString("file://") + defaultIndexFile);
+ else
+ urls.append("");
+ }
+
+ LauncherWindow* window = 0;
+ foreach (QString url, urls) {
+ LauncherWindow* newWindow;
+ if (!window)
+ newWindow = window = new LauncherWindow(&windowOptions);
+ else
+ newWindow = window->newWindow();
+
+ newWindow->load(url);
+ }
+
+ window->show();
+ return launcherMain(app);
+}
+
+#include "qttestbrowser.moc"
