Diff
Modified: trunk/ChangeLog (92685 => 92686)
--- trunk/ChangeLog 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/ChangeLog 2011-08-09 15:01:45 UTC (rev 92686)
@@ -1,3 +1,14 @@
+2011-08-09 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r92683.
+ http://trac.webkit.org/changeset/92683
+ https://bugs.webkit.org/show_bug.cgi?id=65921
+
+ "Breaks Qt --minimal build. Revert pending update of the Qt
+ minimal configuration" (Requested by simathur on #webkit).
+
+ * Source/WebKit.pri:
+
2011-08-09 Siddharth Mathur <[email protected]>
[Qt] Simplify code by removing QT_NO_DESKTOPSERVICES and QT_NO_NETWORKDISKCACHE
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (92685 => 92686)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2011-08-09 15:01:45 UTC (rev 92686)
@@ -1136,6 +1136,7 @@
*/
void QWebSettings::enablePersistentStorage(const QString& path)
{
+#ifndef QT_NO_DESKTOPSERVICES
QString storagePath;
if (path.isEmpty()) {
@@ -1168,6 +1169,7 @@
WebCore::PluginDatabase::setPersistentMetadataCachePath(cachePath);
}
#endif
+#endif
}
/*!
Modified: trunk/Source/WebKit/qt/ChangeLog (92685 => 92686)
--- trunk/Source/WebKit/qt/ChangeLog 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-08-09 15:01:45 UTC (rev 92686)
@@ -1,3 +1,15 @@
+2011-08-09 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r92683.
+ http://trac.webkit.org/changeset/92683
+ https://bugs.webkit.org/show_bug.cgi?id=65921
+
+ "Breaks Qt --minimal build. Revert pending update of the Qt
+ minimal configuration" (Requested by simathur on #webkit).
+
+ * Api/qwebsettings.cpp:
+ (QWebSettings::enablePersistentStorage):
+
2011-08-09 Siddharth Mathur <[email protected]>
[Qt] Simplify code by removing QT_NO_DESKTOPSERVICES and QT_NO_NETWORKDISKCACHE
Modified: trunk/Source/WebKit.pri (92685 => 92686)
--- trunk/Source/WebKit.pri 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Source/WebKit.pri 2011-08-09 15:01:45 UTC (rev 92686)
@@ -169,6 +169,7 @@
DEFINES *= QT_NO_CONCURRENT
DEFINES *= QT_NO_CRASHHANDLER
DEFINES *= QT_NO_CURSOR
+ DEFINES *= QT_NO_DESKTOPSERVICES
DEFINES *= QT_NO_FILEDIALOG
DEFINES *= QT_NO_GRAPHICSEFFECT
DEFINES *= QT_NO_IM
Modified: trunk/Tools/ChangeLog (92685 => 92686)
--- trunk/Tools/ChangeLog 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Tools/ChangeLog 2011-08-09 15:01:45 UTC (rev 92686)
@@ -1,3 +1,22 @@
+2011-08-09 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r92683.
+ http://trac.webkit.org/changeset/92683
+ https://bugs.webkit.org/show_bug.cgi?id=65921
+
+ "Breaks Qt --minimal build. Revert pending update of the Qt
+ minimal configuration" (Requested by simathur on #webkit).
+
+ * QtTestBrowser/cookiejar.cpp:
+ (TestBrowserCookieJar::TestBrowserCookieJar):
+ * QtTestBrowser/launcherwindow.cpp:
+ (LauncherWindow::createChrome):
+ (LauncherWindow::setDiskCache):
+ * QtTestBrowser/main.cpp:
+ (LauncherApplication::handleUserOptions):
+ * QtTestBrowser/webpage.cpp:
+ (WebPage::openUrlInDefaultBrowser):
+
2011-08-09 Siddharth Mathur <[email protected]>
[Qt] Simplify code by removing QT_NO_DESKTOPSERVICES and QT_NO_NETWORKDISKCACHE
Modified: trunk/Tools/QtTestBrowser/cookiejar.cpp (92685 => 92686)
--- trunk/Tools/QtTestBrowser/cookiejar.cpp 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Tools/QtTestBrowser/cookiejar.cpp 2011-08-09 15:01:45 UTC (rev 92686)
@@ -41,7 +41,12 @@
m_timer.setSingleShot(true);
connect(&m_timer, SIGNAL(timeout()), this, SLOT(saveToDisk()));
+#ifndef QT_NO_DESKTOPSERVICES
QString path = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
+#else
+ QString path = QDir::homePath() + "/.QtTestBrowser";
+#endif
+
QDir().mkpath(path);
m_file.setFileName(path + "/cookieJar");
}
Modified: trunk/Tools/QtTestBrowser/launcherwindow.cpp (92685 => 92686)
--- trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-08-09 15:01:45 UTC (rev 92686)
@@ -45,8 +45,10 @@
#include <QNetworkReply>
#endif
+#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
#include <QtGui/QDesktopServices>
#include <QtNetwork/QNetworkDiskCache>
+#endif
const int gExitClickArea = 80;
QVector<int> LauncherWindow::m_zoomLevels;
@@ -433,9 +435,11 @@
QMenu* settingsMenu = menuBar()->addMenu("&Settings");
+#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
QAction* toggleDiskCache = settingsMenu->addAction("Use Disk Cache", this, SLOT(setDiskCache(bool)));
toggleDiskCache->setCheckable(true);
toggleDiskCache->setChecked(m_windowOptions.useDiskCache);
+#endif
QAction* toggleAutoLoadImages = settingsMenu->addAction("Disable Auto Load Images", this, SLOT(toggleAutoLoadImages(bool)));
toggleAutoLoadImages->setCheckable(true);
@@ -818,6 +822,7 @@
void LauncherWindow::setDiskCache(bool enable)
{
+#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
m_windowOptions.useDiskCache = enable;
QNetworkDiskCache* cache = 0;
if (enable) {
@@ -826,6 +831,7 @@
cache->setCacheDirectory(cacheLocation);
}
page()->networkAccessManager()->setCache(cache);
+#endif
}
void LauncherWindow::setTouchMocking(bool on)
Modified: trunk/Tools/QtTestBrowser/main.cpp (92685 => 92686)
--- trunk/Tools/QtTestBrowser/main.cpp 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Tools/QtTestBrowser/main.cpp 2011-08-09 15:01:45 UTC (rev 92686)
@@ -182,7 +182,9 @@
<< "[-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]"
@@ -220,7 +222,11 @@
}
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) {
Modified: trunk/Tools/QtTestBrowser/webpage.cpp (92685 => 92686)
--- trunk/Tools/QtTestBrowser/webpage.cpp 2011-08-09 14:55:56 UTC (rev 92685)
+++ trunk/Tools/QtTestBrowser/webpage.cpp 2011-08-09 15:01:45 UTC (rev 92686)
@@ -108,10 +108,12 @@
void WebPage::openUrlInDefaultBrowser(const QUrl& url)
{
+#ifndef QT_NO_DESKTOPSERVICES
if (QAction* action = ""
QDesktopServices::openUrl(action->data().toUrl());
else
QDesktopServices::openUrl(url);
+#endif
}
QString WebPage::userAgentForUrl(const QUrl& url) const
