Changeset 58494 in webkit

Timestamp:

Apr 29, 2010 3:25:16 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-29 Laszlo Gombos <Laszlo Gombos>

Reviewed by Simon Hausmann.

[Qt] Refactor qtscriptglobal.h
​https://bugs.webkit.org/show_bug.cgi?id=37953

Use the same pattern in qtscriptglobal.h as in
qwebkitglobal.h without checking for specific OSs.

• qt/api/qtscriptglobal.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qtscriptglobal.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-04-29  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Refactor qtscriptglobal.h
+        https://bugs.webkit.org/show_bug.cgi?id=37953
+
+        Use the same pattern in qtscriptglobal.h as in 
+        qwebkitglobal.h without checking for specific OSs.
+
+        * qt/api/qtscriptglobal.h:
+
 2010-04-29  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

trunk/JavaScriptCore/qt/api/qtscriptglobal.h

@@ -23 +23 @@
 #include <QtCore/qglobal.h>
 
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
-#  if defined(QT_NODLL)
-#  elif defined(QT_MAKEDLL)        /* create a Qt DLL library */
-#    if defined(QT_BUILD_JAVASCRIPT_LIB)
-#      define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_JAVASCRIPT_EXPORT Q_DECL_IMPORT
-#    endif
-#  elif defined(QT_DLL) /* use a Qt DLL library */
+#if defined(QT_MAKEDLL)        /* create a Qt DLL library */
+#  if defined(QT_BUILD_JAVASCRIPT_LIB)
+#    define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_JAVASCRIPT_EXPORT Q_DECL_IMPORT
+#  endif
+#elif defined(QT_DLL) /* use a Qt DLL library */
+#  define Q_JAVASCRIPT_EXPORT
+#endif
+
+#if !defined(Q_JAVASCRIPT_EXPORT)
+#  if defined(QT_SHARED)
+#    define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
+#  else
 #    define Q_JAVASCRIPT_EXPORT
 #  endif
 #endif
 
-#if defined(QT_SHARED)
-#  define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
-#else
-#  define Q_JAVASCRIPT_EXPORT
 #endif
-
-#endif