Changeset 65581 in webkit

Timestamp:

Aug 17, 2010 6:22:05 PM (14 years ago)

Author:

Laszlo Gombos

Message:

2010-08-17 Laszlo Gombos <Laszlo Gombos>

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 Gombos>

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):

Location:

trunk

Files:

• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)
• WebKitTools/QtTestBrowser/launcherwindow.cpp (modified) (4 diffs)
• WebKitTools/QtTestBrowser/launcherwindow.h (modified) (1 diff)
• WebKitTools/QtTestBrowser/mainwindow.cpp (modified) (2 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-08-17  Laszlo Gombos  <laszlo.1.gombos@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@openbossa.org>
 

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp

@@ -216 +216 @@
     Q_ASSERT(model);
 
-#if !defined(Q_WS_S60)
+#if !defined(Q_OS_SYMBIAN)
     m_combo->setFont(font());
 #endif

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-17  Laszlo Gombos  <laszlo.1.gombos@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@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -572 +572 @@
 
     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

trunk/WebKitTools/QtTestBrowser/launcherwindow.cpp

@@ -66 +66 @@
     setCentralWidget(splitter);
 
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
     setWindowState(Qt::WindowMaximized);
 #else
@@ -714 +714 @@
         setWindowState(Qt::WindowFullScreen);
     else {
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
         setWindowState(Qt::WindowMaximized);
 #else
@@ -772 +772 @@
 
     if (!enable) {
-#if defined(Q_WS_MAEMO_5) && defined(Q_WS_S60)
+#if defined(Q_WS_MAEMO_5) && defined(Q_OS_SYMBIAN)
         setWindowTitle("");
 #else
@@ -831 +831 @@
     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

trunk/WebKitTools/QtTestBrowser/launcherwindow.h

@@ -83 +83 @@
         , 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

trunk/WebKitTools/QtTestBrowser/mainwindow.cpp

@@ -49 +49 @@
 {
     QToolBar* bar = addToolBar("Navigation");
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
     bar->setIconSize(QSize(16, 16));
 #endif
@@ -66 +66 @@
     urlEdit->setCompleter(completer);
     completer->setModel(&urlModel);
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
     addToolBarBreak();
     addToolBar("Location")->addWidget(urlEdit);