Changeset 58494 in webkit for trunk/JavaScriptCore/qt


Ignore:
Timestamp:
Apr 29, 2010, 3:25:16 AM (15 years ago)
Author:
[email protected]
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:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/qt/api/qtscriptglobal.h

    r53850 r58494  
    2323#include <QtCore/qglobal.h>
    2424
    25 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
    26 #  if defined(QT_NODLL)
    27 #  elif defined(QT_MAKEDLL)        /* create a Qt DLL library */
    28 #    if defined(QT_BUILD_JAVASCRIPT_LIB)
    29 #      define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
    30 #    else
    31 #      define Q_JAVASCRIPT_EXPORT Q_DECL_IMPORT
    32 #    endif
    33 #  elif defined(QT_DLL) /* use a Qt DLL library */
     25#if defined(QT_MAKEDLL)        /* create a Qt DLL library */
     26#  if defined(QT_BUILD_JAVASCRIPT_LIB)
     27#    define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
     28#  else
     29#    define Q_JAVASCRIPT_EXPORT Q_DECL_IMPORT
     30#  endif
     31#elif defined(QT_DLL) /* use a Qt DLL library */
     32#  define Q_JAVASCRIPT_EXPORT
     33#endif
     34
     35#if !defined(Q_JAVASCRIPT_EXPORT)
     36#  if defined(QT_SHARED)
     37#    define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
     38#  else
    3439#    define Q_JAVASCRIPT_EXPORT
    3540#  endif
    3641#endif
    3742
    38 #if defined(QT_SHARED)
    39 #  define Q_JAVASCRIPT_EXPORT Q_DECL_EXPORT
    40 #else
    41 #  define Q_JAVASCRIPT_EXPORT
    4243#endif
    43 
    44 #endif
Note: See TracChangeset for help on using the changeset viewer.