Title: [99571] trunk
Revision
99571
Author
ves...@webkit.org
Date
2011-11-08 08:22:16 -0800 (Tue, 08 Nov 2011)

Log Message

[Qt] Use qmake's builtin rules for copying framework headers on Mac OS

Now that we generate the forwarding headers eiher as part of QtWebKit.pro
(for Qt 4.8), or as part of the root project file (for Qt 5), we can assume
that the files are there and use $$files() to list the files to be copied.

Reviewed by Csaba Osztrogonác.

Modified Paths

Diff

Modified: trunk/ChangeLog (99570 => 99571)


--- trunk/ChangeLog	2011-11-08 16:21:26 UTC (rev 99570)
+++ trunk/ChangeLog	2011-11-08 16:22:16 UTC (rev 99571)
@@ -1,3 +1,15 @@
+2011-11-08  Tor Arne Vestbø  <tor.arne.ves...@nokia.com>
+
+        [Qt] Use qmake's builtin rules for copying framework headers on Mac OS
+
+        Now that we generate the forwarding headers eiher as part of QtWebKit.pro
+        (for Qt 4.8), or as part of the root project file (for Qt 5), we can assume
+        that the files are there and use $$files() to list the files to be copied.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Source/api.pri:
+
 2011-11-08  Yuqiang Xian  <yuqiang.x...@intel.com>
 
         Enable DFG JIT by default on X86 Linux and Mac platforms

Modified: trunk/Source/api.pri (99570 => 99571)


--- trunk/Source/api.pri	2011-11-08 16:21:26 UTC (rev 99570)
+++ trunk/Source/api.pri	2011-11-08 16:22:16 UTC (rev 99571)
@@ -200,23 +200,9 @@
 
         CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
         FRAMEWORK_HEADERS.version = Versions
-        FRAMEWORK_HEADERS.files = $$dirname(headers.files)/QtWebKit
+        FRAMEWORK_HEADERS.files = $$files($$headers.files, false)
         FRAMEWORK_HEADERS.path = Headers
         QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-
-        # No-op to satisfy the dependency for FRAMEWORK_HEADERS
-        module_include.target = $$dirname(headers.files)/QtWebKit
-        module_include.commands = $${MAKEFILE_NOOP_COMMAND}
-        contains(QMAKE_EXTRA_TARGETS, fwheader_generator): module_include.depends += fwheader_generator
-        QMAKE_EXTRA_TARGETS += module_include
-
-        # Qmake assumes that FRAMEWORK_HEADERS.files is a list of files, but we dont' know that
-        # until the forwarding headers have been generated, so we have to copy them manually.
-        copy_framework_headers.commands = $(COPY_DIR) $$headers.files $${DESTDIR}/$${TARGET}.framework/$${FRAMEWORK_HEADERS.path}/
-        contains(QMAKE_EXTRA_TARGETS, fwheader_generator): copy_framework_headers.depends += fwheader_generator
-        copy_framework_headers.depends += all
-        QMAKE_EXTRA_TARGETS += copy_framework_headers
-        DEFAULT_TARGETS += copy_framework_headers
     }
 
     QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to