Title: [136233] trunk
- Revision
- 136233
- Author
- ves...@webkit.org
- Date
- 2012-11-30 06:16:44 -0800 (Fri, 30 Nov 2012)
Log Message
[Qt] Build as a regular Qt module when production_build is enabled
Instead of always setting CONFIG+=force_independent. This means the
libs, headers, and documentation will end up in qtbase for developer
builds of Qt, instead of always in the QtWebKit build directory.
Reviewed by Simon Hausmann.
* Source/api.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (136232 => 136233)
--- trunk/ChangeLog 2012-11-30 14:16:26 UTC (rev 136232)
+++ trunk/ChangeLog 2012-11-30 14:16:44 UTC (rev 136233)
@@ -1,3 +1,15 @@
+2012-11-30 Tor Arne Vestbø <tor.arne.ves...@digia.com>
+
+ [Qt] Build as a regular Qt module when production_build is enabled
+
+ Instead of always setting CONFIG+=force_independent. This means the
+ libs, headers, and documentation will end up in qtbase for developer
+ builds of Qt, instead of always in the QtWebKit build directory.
+
+ Reviewed by Simon Hausmann.
+
+ * Source/api.pri:
+
2012-11-29 Rafael Weinstein <rafa...@chromium.org>
[HTMLTemplateElement] Add feature flag
Modified: trunk/Source/api.pri (136232 => 136233)
--- trunk/Source/api.pri 2012-11-30 14:16:26 UTC (rev 136232)
+++ trunk/Source/api.pri 2012-11-30 14:16:44 UTC (rev 136233)
@@ -53,7 +53,7 @@
# For WebKit we don't want that behavior for the libraries, as we want
# them to be self-contained in the WebKit build dir.
#
-CONFIG += force_independent
+!production_build: CONFIG += force_independent
BASE_TARGET = $$TARGET
@@ -63,7 +63,7 @@
macx:!debug_and_release:debug: TARGET = $$BASE_TARGET
# Make sure the install_name of the QtWebKit library point to webkit
-macx {
+force_independent:macx {
# We do our own absolute path so that we can trick qmake into
# using the webkit build path instead of the Qt install path.
CONFIG -= absolute_library_soname
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
