Changeset 42515 in webkit


Ignore:
Timestamp:
Apr 14, 2009 1:14:47 PM (15 years ago)
Author:
Simon Hausmann
Message:

2009-04-14 Laszlo Gombos <Laszlo Gombos>

Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=24841

Fix linking against QtWebKit for Symbian and other platforms
where the OS ABI distinguishes between an import or an export situation.

Location:
trunk/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/qt/Api/qwebkitglobal.h

    r39746 r42515  
    2323#include <QtCore/qglobal.h>
    2424
    25 #if defined(Q_OS_WIN)
    26 #  if defined(QT_NODLL)
    27 #    undef QT_MAKEDLL
    28 #    undef QT_DLL
    29 #  elif defined(QT_MAKEDLL)        /* create a Qt DLL library */
    30 #    if defined(QT_DLL)
    31 #      undef QT_DLL
    32 #    endif
    33 #    if defined(BUILD_WEBKIT)
    34 #        define QWEBKIT_EXPORT Q_DECL_EXPORT
    35 #    else
    36 #        define QWEBKIT_EXPORT Q_DECL_IMPORT
    37 #    endif
    38 #  elif defined(QT_DLL) /* use a Qt DLL library */
    39 #    define QWEBKIT_EXPORT Q_DECL_IMPORT
     25#if defined(QT_MAKEDLL)        /* create a Qt DLL library */
     26#  if defined(BUILD_WEBKIT)
     27#      define QWEBKIT_EXPORT Q_DECL_EXPORT
     28#  else
     29#      define QWEBKIT_EXPORT Q_DECL_IMPORT
    4030#  endif
     31#elif defined(QT_DLL) /* use a Qt DLL library */
     32#  define QWEBKIT_EXPORT Q_DECL_IMPORT
    4133#endif
    4234

  • trunk/WebKit/qt/ChangeLog

    r42494 r42515  
     12009-04-14  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=24841
     6
     7        Fix linking against QtWebKit for Symbian and other platforms
     8        where the OS ABI distinguishes between an import or an export situation.
     9
     10        * Api/qwebkitglobal.h: Instead of white-listing Win, remove the test.
     11
    1122009-04-14  Kenneth Rohde Christiansen  <kenneth.christiansen@openbossa.org>
    213
Note: See TracChangeset for help on using the changeset viewer.