2011-03-15 Siddharth Mathur <siddharth.mathur@nokia.com>

        Reviewed by Laszlo Gombos.

        [Qt][Symbian][WK2] Fix exporting and importing the WebProcessMainQt symbol
        https://bugs.webkit.org/show_bug.cgi?id=56417

        Use the Q_DECL_EXPORT and Q_DECL_IMPORT macros directly to make sure
        the symbol is always exported/imported.

        * WebProcess/qt/WebProcessMainQt.cpp:
        (WebKit::WebProcessMainQt):
        * qt/MainQt.cpp:

git-svn-id: svn://svn.chromium.org/blink/trunk@81186 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebKit2/ChangeLog

+2011-03-15  Siddharth Mathur  <siddharth.mathur@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][Symbian][WK2] Fix exporting and importing the WebProcessMainQt symbol
+        https://bugs.webkit.org/show_bug.cgi?id=56417
+
+        Use the Q_DECL_EXPORT and Q_DECL_IMPORT macros directly to make sure
+        the symbol is always exported/imported.
+
+        * WebProcess/qt/WebProcessMainQt.cpp:
+        (WebKit::WebProcessMainQt):
+        * qt/MainQt.cpp:
+
 2011-03-15  Alexey Proskuryakov  <ap@apple.com>
 
         Reviewed by Darin Adler.

third_party/WebKit/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp

@@ -48,13 +48,6 @@
 #endif
 #endif
 
-#if !defined(QWEBKIT_EXPORT)
-#if defined(QT_SHARED)
-#define QWEBKIT_EXPORT Q_DECL_EXPORT
-#else
-#define QWEBKIT_EXPORT
-#endif
-#endif
 #ifndef NDEBUG
 #include <QDebug>
 #endif
@@ -137,7 +130,7 @@ static void initializeProxy()
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 }
 
-QWEBKIT_EXPORT int WebProcessMainQt(int argc, char** argv)
+Q_DECL_EXPORT int WebProcessMainQt(int argc, char** argv)
 {
     QApplication::setGraphicsSystem("raster");
     QApplication* app = new QApplication(argc, argv);

third_party/WebKit/Source/WebKit2/qt/MainQt.cpp

@@ -26,16 +26,8 @@
 
 #include <QtGlobal>
 
-#if !defined(QWEBKIT_EXPORT)
-#if defined(QT_SHARED)
-#define QWEBKIT_EXPORT Q_DECL_EXPORT
-#else
-#define QWEBKIT_EXPORT
-#endif
-#endif
-
 namespace WebKit {
-QWEBKIT_EXPORT int WebProcessMainQt(int argc, char** argv);
+Q_DECL_IMPORT int WebProcessMainQt(int argc, char** argv);
 }
 
 // The framework entry point.