Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (99663 => 99664)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-09 08:42:44 UTC (rev 99664)
@@ -1,3 +1,16 @@
+2011-11-08 Simon Hausmann <[email protected]>
+
+ [Qt] Replace use of QApplication with QGuiApplication
+ https://bugs.webkit.org/show_bug.cgi?id=71794
+
+ Reviewed by Andreas Kling.
+
+ Add compat headers for use when building with Qt 4: QGuiApplication
+ is typedef'ed to QApplication.
+
+ * wtf/qt/compat/QGuiApplication: Added.
+ * wtf/qt/compat/qguiapplication.h: Added.
+
2011-11-08 Sheriff Bot <[email protected]>
Unreviewed, rolling out r99647.
Added: trunk/Source/_javascript_Core/wtf/qt/compat/QGuiApplication (0 => 99664)
--- trunk/Source/_javascript_Core/wtf/qt/compat/QGuiApplication (rev 0)
+++ trunk/Source/_javascript_Core/wtf/qt/compat/QGuiApplication 2011-11-09 08:42:44 UTC (rev 99664)
@@ -0,0 +1 @@
+#include "qguiapplication.h"
Added: trunk/Source/_javascript_Core/wtf/qt/compat/qguiapplication.h (0 => 99664)
--- trunk/Source/_javascript_Core/wtf/qt/compat/qguiapplication.h (rev 0)
+++ trunk/Source/_javascript_Core/wtf/qt/compat/qguiapplication.h 2011-11-09 08:42:44 UTC (rev 99664)
@@ -0,0 +1,27 @@
+/*
+ Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef qguiapplication_h
+#define qguiapplication_h
+
+#include <QApplication>
+
+typedef QApplication QGuiApplication;
+
+#endif
Modified: trunk/Source/WebCore/ChangeLog (99663 => 99664)
--- trunk/Source/WebCore/ChangeLog 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebCore/ChangeLog 2011-11-09 08:42:44 UTC (rev 99664)
@@ -1,3 +1,34 @@
+2011-11-08 Simon Hausmann <[email protected]>
+
+ [Qt] Replace use of QApplication with QGuiApplication
+ https://bugs.webkit.org/show_bug.cgi?id=71794
+
+ Reviewed by Andreas Kling.
+
+ * Target.pri: Add compat include dir when compiling with Qt 4.
+ * platform/graphics/gstreamer/PlatformVideoWindowQt.cpp:
+ (FullScreenVideoWindow::closeEvent): Replace use of QApplication with QGuiApplication.
+ (FullScreenVideoWindow::hideCursor): Ditto.
+ (FullScreenVideoWindow::showCursor): Ditto.
+ * platform/graphics/qt/TileQt.cpp: Remove unnecessary inclusion of QApplication.
+ * platform/qt/ClipboardQt.cpp: Replace use of QApplication with QGuiApplication.
+ (WebCore::ClipboardQt::ClipboardQt):
+ (WebCore::ClipboardQt::clearData):
+ (WebCore::ClipboardQt::clearAllData):
+ (WebCore::ClipboardQt::setData):
+ (WebCore::ClipboardQt::declareAndWriteDragImage):
+ (WebCore::ClipboardQt::writeURL):
+ (WebCore::ClipboardQt::writeRange):
+ (WebCore::ClipboardQt::writePlainText):
+ * platform/qt/PasteboardQt.cpp: Ditto.
+ (WebCore::Pasteboard::writeSelection):
+ (WebCore::Pasteboard::canSmartReplace):
+ (WebCore::Pasteboard::plainText):
+ (WebCore::Pasteboard::documentFragment):
+ (WebCore::Pasteboard::writePlainText):
+ (WebCore::Pasteboard::writeURL):
+ (WebCore::Pasteboard::writeImage):
+
2011-11-09 Simon Hausmann <[email protected]>
Mac Build fix part 2: Oops, use the correct wtf/ prefix for the WTF include.
Modified: trunk/Source/WebCore/Target.pri (99663 => 99664)
--- trunk/Source/WebCore/Target.pri 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebCore/Target.pri 2011-11-09 08:42:44 UTC (rev 99664)
@@ -28,6 +28,8 @@
# Add a QtScript dependency for the time being, in order to pull in the include
# path for QtScript when it's built as a standalone module
QT += script
+} else {
+ INCLUDEPATH += $$PWD/../_javascript_Core/wtf/qt/compat
}
RESOURCES += \
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp (99663 => 99664)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -23,7 +23,7 @@
#include "HTMLVideoElement.h"
#include "PlatformVideoWindowPrivate.h"
-#include <QApplication>
+#include <QGuiApplication>
#include <QDesktopWidget>
#include <QKeyEvent>
#include <QPalette>
@@ -61,7 +61,7 @@
setMouseTracking(false);
releaseMouse();
#ifndef QT_NO_CURSOR
- QApplication::restoreOverrideCursor();
+ QGuiApplication::restoreOverrideCursor();
#endif
}
@@ -105,14 +105,14 @@
void FullScreenVideoWindow::hideCursor()
{
#ifndef QT_NO_CURSOR
- QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
+ QGuiApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
#endif
}
void FullScreenVideoWindow::showCursor()
{
#ifndef QT_NO_CURSOR
- QApplication::restoreOverrideCursor();
+ QGuiApplication::restoreOverrideCursor();
m_cursorTimer.start(gHideMouseCursorDelay);
#endif
}
Modified: trunk/Source/WebCore/platform/graphics/qt/TileQt.cpp (99663 => 99664)
--- trunk/Source/WebCore/platform/graphics/qt/TileQt.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebCore/platform/graphics/qt/TileQt.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -25,7 +25,6 @@
#include "GraphicsContext.h"
#include "TiledBackingStore.h"
#include "TiledBackingStoreClient.h"
-#include <QApplication>
#include <QObject>
#include <QPainter>
#include <QRegion>
Modified: trunk/Source/WebCore/platform/qt/ClipboardQt.cpp (99663 => 99664)
--- trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -48,7 +48,7 @@
#include "markup.h"
#include <wtf/text/StringHash.h>
-#include <QApplication>
+#include <QGuiApplication>
#include <QClipboard>
#include <QList>
#include <QMimeData>
@@ -96,7 +96,7 @@
#ifndef QT_NO_CLIPBOARD
if (policy != ClipboardWritable) {
Q_ASSERT(isForCopyAndPaste());
- m_readableData = QApplication::clipboard()->mimeData();
+ m_readableData = QGuiApplication::clipboard()->mimeData();
}
#endif
}
@@ -125,7 +125,7 @@
}
#ifndef QT_NO_CLIPBOARD
if (isForCopyAndPaste())
- QApplication::clipboard()->setMimeData(m_writableData);
+ QGuiApplication::clipboard()->setMimeData(m_writableData);
#endif
}
@@ -136,7 +136,7 @@
#ifndef QT_NO_CLIPBOARD
if (isForCopyAndPaste())
- QApplication::clipboard()->setMimeData(0);
+ QGuiApplication::clipboard()->setMimeData(0);
else
#endif
delete m_writableData;
@@ -187,7 +187,7 @@
#ifndef QT_NO_CLIPBOARD
if (isForCopyAndPaste())
- QApplication::clipboard()->setMimeData(m_writableData);
+ QGuiApplication::clipboard()->setMimeData(m_writableData);
#endif
return true;
}
@@ -296,7 +296,7 @@
m_writableData->setHtml(createMarkup(element, IncludeNode, 0, ResolveAllURLs));
#ifndef QT_NO_CLIPBOARD
if (isForCopyAndPaste())
- QApplication::clipboard()->setMimeData(m_writableData);
+ QGuiApplication::clipboard()->setMimeData(m_writableData);
#endif
}
@@ -312,7 +312,7 @@
m_writableData->setText(title);
#ifndef QT_NO_CLIPBOARD
if (isForCopyAndPaste())
- QApplication::clipboard()->setMimeData(m_writableData);
+ QGuiApplication::clipboard()->setMimeData(m_writableData);
#endif
}
@@ -329,7 +329,7 @@
m_writableData->setHtml(createMarkup(range, 0, AnnotateForInterchange, false, ResolveNonLocalURLs));
#ifndef QT_NO_CLIPBOARD
if (isForCopyAndPaste())
- QApplication::clipboard()->setMimeData(m_writableData);
+ QGuiApplication::clipboard()->setMimeData(m_writableData);
#endif
}
@@ -342,7 +342,7 @@
m_writableData->setText(text);
#ifndef QT_NO_CLIPBOARD
if (isForCopyAndPaste())
- QApplication::clipboard()->setMimeData(m_writableData);
+ QGuiApplication::clipboard()->setMimeData(m_writableData);
#endif
}
Modified: trunk/Source/WebCore/platform/qt/PasteboardQt.cpp (99663 => 99664)
--- trunk/Source/WebCore/platform/qt/PasteboardQt.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebCore/platform/qt/PasteboardQt.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -34,7 +34,7 @@
#include "Image.h"
#include "RenderImage.h"
#include "markup.h"
-#include <qapplication.h>
+#include <qguiapplication.h>
#include <qclipboard.h>
#include <qdebug.h>
#include <qmimedata.h>
@@ -74,7 +74,7 @@
#endif
#ifndef QT_NO_CLIPBOARD
- QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+ QGuiApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
#endif
if (canSmartCopyOrDelete)
md->setData(QLatin1String("application/vnd.qtwebkit.smartpaste"), QByteArray());
@@ -83,7 +83,7 @@
bool Pasteboard::canSmartReplace()
{
#ifndef QT_NO_CLIPBOARD
- if (QApplication::clipboard()->mimeData()->hasFormat((QLatin1String("application/vnd.qtwebkit.smartpaste"))))
+ if (QGuiApplication::clipboard()->mimeData()->hasFormat((QLatin1String("application/vnd.qtwebkit.smartpaste"))))
return true;
#endif
return false;
@@ -92,7 +92,7 @@
String Pasteboard::plainText(Frame*)
{
#ifndef QT_NO_CLIPBOARD
- return QApplication::clipboard()->text(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+ return QGuiApplication::clipboard()->text(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
#else
return String();
#endif
@@ -102,7 +102,7 @@
bool allowPlainText, bool& chosePlainText)
{
#ifndef QT_NO_CLIPBOARD
- const QMimeData* mimeData = QApplication::clipboard()->mimeData(
+ const QMimeData* mimeData = QGuiApplication::clipboard()->mimeData(
m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
chosePlainText = false;
@@ -133,7 +133,7 @@
QString qtext = text;
qtext.replace(QChar(0xa0), QLatin1Char(' '));
md->setText(qtext);
- QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+ QGuiApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
#endif
}
@@ -146,7 +146,7 @@
QString urlString = url.string();
md->setText(urlString);
md->setUrls(QList<QUrl>() << url);
- QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
+ QGuiApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
#endif
}
@@ -168,7 +168,7 @@
QPixmap* pixmap = image->nativeImageForCurrentFrame();
if (!pixmap)
return;
- QApplication::clipboard()->setPixmap(*pixmap, QClipboard::Clipboard);
+ QGuiApplication::clipboard()->setPixmap(*pixmap, QClipboard::Clipboard);
#endif
}
Modified: trunk/Source/WebKit/qt/ChangeLog (99663 => 99664)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-09 08:42:44 UTC (rev 99664)
@@ -1,3 +1,14 @@
+2011-11-08 Simon Hausmann <[email protected]>
+
+ [Qt] Replace use of QApplication with QGuiApplication
+ https://bugs.webkit.org/show_bug.cgi?id=71794
+
+ Reviewed by Andreas Kling.
+
+ * WebCoreSupport/QtWebComboBox.cpp:
+ (WebCore::QtWebComboBox::showPopupAtCursorPosition): Replace use of QApplication
+ with QCoreApplication.
+
2011-11-07 Adam Barth <[email protected]>
Move static "policy" state from SecurityOrigin.cpp to SecurityPolicy.cpp
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.cpp (99663 => 99664)
--- trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -25,7 +25,7 @@
#ifndef QT_NO_COMBOBOX
#include <QAbstractItemView>
-#include <QApplication>
+#include <QCoreApplication>
#include <QtGui/QMouseEvent>
namespace WebCore {
@@ -43,7 +43,7 @@
{
QMouseEvent event(QEvent::MouseButtonPress, QCursor::pos(), Qt::LeftButton,
Qt::LeftButton, Qt::NoModifier);
- QApplication::sendEvent(this, &event);
+ QCoreApplication::sendEvent(this, &event);
}
bool QtWebComboBox::eventFilter(QObject* watched, QEvent* event)
Modified: trunk/Source/WebKit2/ChangeLog (99663 => 99664)
--- trunk/Source/WebKit2/ChangeLog 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-09 08:42:44 UTC (rev 99664)
@@ -1,3 +1,18 @@
+2011-11-08 Simon Hausmann <[email protected]>
+
+ [Qt] Replace use of QApplication with QGuiApplication
+ https://bugs.webkit.org/show_bug.cgi?id=71794
+
+ Reviewed by Andreas Kling.
+
+ * Platform/CoreIPC/unix/ConnectionUnix.cpp: Remove unnecessary QApplication inclusion.
+ * Platform/qt/RunLoopQt.cpp: Replace QApplication include with QCoreApplication.
+ * UIProcess/Launcher/qt/ProcessLauncherQt.cpp: Ditto.
+ * UIProcess/Launcher/qt/ThreadLauncherQt.cpp: Remove unnecessary QApplication inclusion.
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::handleMousePressEvent): Replace QApplication usage with QStyleHints.
+ (QtWebPageProxy::handleMouseDoubleClickEvent): Ditto.
+
2011-11-07 Adam Barth <[email protected]>
Move static "policy" state from SecurityOrigin.cpp to SecurityPolicy.cpp
Modified: trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp (99663 => 99664)
--- trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -39,7 +39,6 @@
#include <wtf/OwnArrayPtr.h>
#if PLATFORM(QT)
-#include <QApplication>
#include <QSocketNotifier>
#elif PLATFORM(GTK)
#include <glib.h>
Modified: trunk/Source/WebKit2/Platform/qt/RunLoopQt.cpp (99663 => 99664)
--- trunk/Source/WebKit2/Platform/qt/RunLoopQt.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit2/Platform/qt/RunLoopQt.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -29,7 +29,7 @@
#include "WorkItem.h"
-#include <QApplication>
+#include <QCoreApplication>
#include <QAbstractEventDispatcher>
#include <QObject>
#include <QMetaMethod>
Modified: trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (99663 => 99664)
--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -30,7 +30,7 @@
#include "Connection.h"
#include "RunLoop.h"
#include "WebProcess.h"
-#include <QApplication>
+#include <QCoreApplication>
#include <QDebug>
#include <QFile>
#include <QLocalServer>
Modified: trunk/Source/WebKit2/UIProcess/Launcher/qt/ThreadLauncherQt.cpp (99663 => 99664)
--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ThreadLauncherQt.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ThreadLauncherQt.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -33,7 +33,6 @@
#include <wtf/MainThread.h>
#include <wtf/Threading.h>
-#include <QApplication>
#include <QDebug>
#include <QFile>
#include <QLocalServer>
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (99663 => 99664)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-09 08:29:27 UTC (rev 99663)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-09 08:42:44 UTC (rev 99664)
@@ -51,10 +51,11 @@
#include "WebPopupMenuProxyQt.h"
#include "WKStringQt.h"
#include "WKURLQt.h"
-#include <QApplication>
+#include <QGuiApplication>
#include <QGraphicsSceneMouseEvent>
#include <QJSEngine>
#include <QMimeData>
+#include <QStyleHints>
#include <QTouchEvent>
#include <QUndoStack>
#include <QtDebug>
@@ -235,7 +236,7 @@
bool QtWebPageProxy::handleMousePressEvent(QMouseEvent* ev)
{
- if (m_tripleClickTimer.isActive() && (ev->pos() - m_tripleClick).manhattanLength() < QApplication::startDragDistance()) {
+ if (m_tripleClickTimer.isActive() && (ev->pos() - m_tripleClick).manhattanLength() < qApp->styleHints()->startDragDistance()) {
m_webPageProxy->handleMouseEvent(NativeWebMouseEvent(ev, /*eventClickCount=*/3));
return ev->isAccepted();
}
@@ -254,7 +255,7 @@
{
m_webPageProxy->handleMouseEvent(NativeWebMouseEvent(ev, /*eventClickCount=*/2));
- m_tripleClickTimer.start(QApplication::doubleClickInterval(), this);
+ m_tripleClickTimer.start(qApp->styleHints()->mouseDoubleClickInterval(), this);
m_tripleClick = ev->localPos().toPoint();
return ev->isAccepted();
}
