Title: [136384] trunk
- Revision
- 136384
- Author
- [email protected]
- Date
- 2012-12-03 04:40:42 -0800 (Mon, 03 Dec 2012)
Log Message
[Qt][Mac] QtWebKitWidgets has wrong install_name.
This part got lost during the library split.
It was done for QtWebKit before, but it also
needs to be applied to QtWebKitWidgets.
Reviewed by Tor Arne Vestbø.
* Source/widgetsapi.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (136383 => 136384)
--- trunk/ChangeLog 2012-12-03 12:39:46 UTC (rev 136383)
+++ trunk/ChangeLog 2012-12-03 12:40:42 UTC (rev 136384)
@@ -1,3 +1,15 @@
+2012-12-03 Zeno Albisser <[email protected]>
+
+ [Qt][Mac] QtWebKitWidgets has wrong install_name.
+
+ This part got lost during the library split.
+ It was done for QtWebKit before, but it also
+ needs to be applied to QtWebKitWidgets.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Source/widgetsapi.pri:
+
2012-11-30 Justin Novosad <[email protected]>
[Chromium] Animation updates fail when using a canvas as a CSS backround-image style with -webkit-canvas
Modified: trunk/Source/widgetsapi.pri (136383 => 136384)
--- trunk/Source/widgetsapi.pri 2012-12-03 12:39:46 UTC (rev 136383)
+++ trunk/Source/widgetsapi.pri 2012-12-03 12:40:42 UTC (rev 136384)
@@ -74,6 +74,34 @@
# Allow doing a debug-only build of WebKit (not supported by Qt)
macx:!debug_and_release:debug: TARGET = $$BASE_TARGET
+# Make sure the install_name of the QtWebKit library point to webkit
+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
+ QMAKE_LFLAGS_SONAME = $$QMAKE_LFLAGS_SONAME$$WEBKIT_DESTDIR/
+
+ !debug_and_release|build_pass {
+ # We also have to make sure the install_name is correct when
+ # the library is installed.
+ change_install_name.depends = install_target
+
+ # The install rules generated by qmake for frameworks are busted in
+ # that both the debug and the release makefile copy QtWebKit.framework
+ # into the install dir, so whatever changes we did to the release library
+ # will get overwritten when the debug library is installed. We work around
+ # that by running install_name on both, for both configs.
+ change_install_name.commands = framework_dir=\$\$(dirname $(TARGETD)); \
+ for file in \$\$(ls $$[QT_INSTALL_LIBS]/\$\$framework_dir/$$BASE_TARGET*); do \
+ install_name_tool -id \$\$file \$\$file; \
+ done
+ default_install_target.target = install
+ default_install_target.depends += change_install_name
+
+ QMAKE_EXTRA_TARGETS += change_install_name default_install_target
+ }
+}
+
SOURCES += \
$$PWD/WebKit/qt/WidgetApi/qgraphicswebview.cpp \
$$PWD/WebKit/qt/WidgetApi/qwebframe.cpp \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
