Changeset 24064 in webkit

Timestamp:

Jul 6, 2007 10:28:27 AM (17 years ago)

Author:

staikos

Message:

Don't clobber variables that are already set, resulting in a broken build.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-06  George Staikos  <staikos@kde.org>
+
+        Qt build fix: Don't clobber qmake variables that are already set.
+
+        * WebCore.pro:
+
 2007-07-05  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/WebCore.pro

@@ -37 +37 @@
 
 # Optional components (look for defs in config.h and included files!)
-DEFINES += ENABLE_ICONDATABASE=1
-DEFINES += ENABLE_XPATH=1
-DEFINES += ENABLE_XSLT=1
-#DEFINES += ENABLE_XBL=1
-qt-port:DEFINES += ENABLE_SVG=1
+!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
+!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
+!contains(DEFINES, ENABLE_XSLT=.): DEFINES += ENABLE_XSLT=1
+#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
+qt-port: !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
 gdk-port:DEFINES += ENABLE_SVG=1