Changeset 52792 in webkit

Timestamp:

Jan 5, 2010 1:45:30 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Fix broken export macros in package builds.

Reviewed by Tor Arne Vestbø.

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

Always define QT_MAKEDLL unless we're doing a static
build or we're building inside of Qt. When building
inside of Qt the correct define is pulled from qbase.pri.

• WebCore.pro:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-05  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Fix broken export macros in package builds.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33202
+
+        Always define QT_MAKEDLL unless we're doing a static
+        build or we're building inside of Qt. When building
+        inside of Qt the correct define is pulled from qbase.pri.
+
+        * WebCore.pro:
+
 2010-01-04  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/WebCore.pro

@@ -36 +36 @@
     DEFINES *= NDEBUG
 } else {
-    !static: DEFINES += QT_MAKEDLL
 
     CONFIG(debug, debug|release) {
@@ -48 +47 @@
 }
 
-!CONFIG(QTDIR_build): DESTDIR = $$OUTPUT_DIR/lib
+!CONFIG(QTDIR_build) {
+    DESTDIR = $$OUTPUT_DIR/lib
+    !static: DEFINES += QT_MAKEDLL
+}
 
 GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR${QMAKE_DIR_SEP}