[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Wed Dec 22 12:16:29 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f76caf1030f78b1f3dbb56d49d738e992fff7609
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 18 01:22:05 2010 +0000
2010-08-17 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Ariya Hidayat.
[Qt] [Symbian] Consistently use Q_OS_SYMBIAN to guard all Symbian platform dependencies
https://bugs.webkit.org/show_bug.cgi?id=44124
Q_WS_S60 is not defined for Symbian^4 devices as Q_WS_S60 used to guard
Avkon UI framework dependencies. Use Q_OS_SYMBIAN everywhere to mark
Symbian dependencies.
* WebCoreSupport/QtFallbackWebPopup.cpp:
(WebCore::QtFallbackWebPopup::populate):
2010-08-17 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Ariya Hidayat.
[Qt] [Symbian] Consistently use Q_OS_SYMBIAN to guard all Symbian platform dependencies
https://bugs.webkit.org/show_bug.cgi?id=44124
Q_WS_S60 is not defined for Symbian^4 devices as Q_WS_S60 used to guard
Avkon UI framework dependencies. Use Q_OS_SYMBIAN everywhere to mark
Symbian dependencies.
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::DumpRenderTree::open):
* QtTestBrowser/launcherwindow.cpp:
(LauncherWindow::init):
(LauncherWindow::toggleFullScreenMode):
(LauncherWindow::showFPS):
(LauncherWindow::updateFPS):
* QtTestBrowser/launcherwindow.h:
(WindowOptions::WindowOptions):
* QtTestBrowser/mainwindow.cpp:
(MainWindow::buildUI):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65581 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1069650..25e8fb3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-17 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Ariya Hidayat.
+
+ [Qt] [Symbian] Consistently use Q_OS_SYMBIAN to guard all Symbian platform dependencies
+ https://bugs.webkit.org/show_bug.cgi?id=44124
+
+ Q_WS_S60 is not defined for Symbian^4 devices as Q_WS_S60 used to guard
+ Avkon UI framework dependencies. Use Q_OS_SYMBIAN everywhere to mark
+ Symbian dependencies.
+
+ * WebCoreSupport/QtFallbackWebPopup.cpp:
+ (WebCore::QtFallbackWebPopup::populate):
+
2010-08-17 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Darin Adler.
diff --git a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
index 21678c7..3b53476 100644
--- a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
+++ b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
@@ -215,7 +215,7 @@ void QtFallbackWebPopup::populate(const QWebSelectData& data)
QStandardItemModel* model = qobject_cast<QStandardItemModel*>(m_combo->model());
Q_ASSERT(model);
-#if !defined(Q_WS_S60)
+#if !defined(Q_OS_SYMBIAN)
m_combo->setFont(font());
#endif
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5ab6a62..f7a43a7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,26 @@
+2010-08-17 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Ariya Hidayat.
+
+ [Qt] [Symbian] Consistently use Q_OS_SYMBIAN to guard all Symbian platform dependencies
+ https://bugs.webkit.org/show_bug.cgi?id=44124
+
+ Q_WS_S60 is not defined for Symbian^4 devices as Q_WS_S60 used to guard
+ Avkon UI framework dependencies. Use Q_OS_SYMBIAN everywhere to mark
+ Symbian dependencies.
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::DumpRenderTree::open):
+ * QtTestBrowser/launcherwindow.cpp:
+ (LauncherWindow::init):
+ (LauncherWindow::toggleFullScreenMode):
+ (LauncherWindow::showFPS):
+ (LauncherWindow::updateFPS):
+ * QtTestBrowser/launcherwindow.h:
+ (WindowOptions::WindowOptions):
+ * QtTestBrowser/mainwindow.cpp:
+ (MainWindow::buildUI):
+
2010-08-17 Dirk Pranke <dpranke at chromium.org>
Reviewed by David Levin.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index c6c39b5..4a57d1d 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -571,7 +571,7 @@ void DumpRenderTree::open(const QUrl& url)
m_page->event(&ev);
QWebSettings::clearMemoryCaches();
-#if !(defined(Q_WS_S60) && QT_VERSION <= QT_VERSION_CHECK(4, 6, 2))
+#if !(defined(Q_OS_SYMBIAN) && QT_VERSION <= QT_VERSION_CHECK(4, 6, 2))
QFontDatabase::removeAllApplicationFonts();
#endif
#if defined(Q_WS_X11)
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index a6f17d1..9b7aa0d 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -65,7 +65,7 @@ void LauncherWindow::init()
QSplitter* splitter = new QSplitter(Qt::Vertical, this);
setCentralWidget(splitter);
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
setWindowState(Qt::WindowMaximized);
#else
setWindowState(Qt::WindowNoState);
@@ -713,7 +713,7 @@ void LauncherWindow::toggleFullScreenMode(bool enable)
if (enable)
setWindowState(Qt::WindowFullScreen);
else {
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
setWindowState(Qt::WindowMaximized);
#else
setWindowState(Qt::WindowNoState);
@@ -771,7 +771,7 @@ void LauncherWindow::showFPS(bool enable)
view->setFrameRateMeasurementEnabled(enable);
if (!enable) {
-#if defined(Q_WS_MAEMO_5) && defined(Q_WS_S60)
+#if defined(Q_WS_MAEMO_5) && defined(Q_OS_SYMBIAN)
setWindowTitle("");
#else
statusBar()->clearMessage();
@@ -830,7 +830,7 @@ void LauncherWindow::updateFPS(int fps)
{
QString fpsStatusText = QString("Current FPS: %1").arg(fps);
-#if defined(Q_WS_MAEMO_5) && defined(Q_WS_S60)
+#if defined(Q_WS_MAEMO_5) && defined(Q_OS_SYMBIAN)
setWindowTitle(fpsStatusText);
#else
statusBar()->showMessage(fpsStatusText);
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.h b/WebKitTools/QtTestBrowser/launcherwindow.h
index f4ef139..65f390d 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.h
+++ b/WebKitTools/QtTestBrowser/launcherwindow.h
@@ -82,7 +82,7 @@ public:
, useCompositing(true)
, useTiledBackingStore(false)
, useWebGL(false)
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_S60)
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
, useFrameFlattening(true)
#else
, useFrameFlattening(false)
diff --git a/WebKitTools/QtTestBrowser/mainwindow.cpp b/WebKitTools/QtTestBrowser/mainwindow.cpp
index abb608f..1a9aa5f 100644
--- a/WebKitTools/QtTestBrowser/mainwindow.cpp
+++ b/WebKitTools/QtTestBrowser/mainwindow.cpp
@@ -48,7 +48,7 @@ MainWindow::MainWindow(const QString& url)
void MainWindow::buildUI()
{
QToolBar* bar = addToolBar("Navigation");
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
bar->setIconSize(QSize(16, 16));
#endif
QAction* reloadAction = page()->action(QWebPage::Reload);
@@ -65,7 +65,7 @@ void MainWindow::buildUI()
QCompleter* completer = new QCompleter(this);
urlEdit->setCompleter(completer);
completer->setModel(&urlModel);
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
addToolBarBreak();
addToolBar("Location")->addWidget(urlEdit);
#else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list