Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (128615 => 128616)
--- trunk/Source/_javascript_Core/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,15 @@
+2012-09-14 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Make force_static_libs_as_shared work on Mac OS
+
+ We had to move a few LIBS += around that were in the wrong place,
+ and not caught when everything was just linked into the final
+ QtWebKit library.
+
+ Reviewed by Simon Hausmann.
+
+ * jsc.pro: No need for AppKit, we get it from WTF.pri
+
2012-09-14 Kevin Funk <[email protected]>
Fix interpreter build
Modified: trunk/Source/_javascript_Core/jsc.pro (128615 => 128616)
--- trunk/Source/_javascript_Core/jsc.pro 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/_javascript_Core/jsc.pro 2012-09-14 15:58:28 UTC (rev 128616)
@@ -19,10 +19,6 @@
SOURCES = jsc.cpp
-mac {
- LIBS_PRIVATE += -framework AppKit
-}
-
win32-* {
LIBS += -ladvapi32
}
Modified: trunk/Source/WTF/ChangeLog (128615 => 128616)
--- trunk/Source/WTF/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WTF/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,15 @@
+2012-09-14 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Make force_static_libs_as_shared work on Mac OS
+
+ We had to move a few LIBS += around that were in the wrong place,
+ and not caught when everything was just linked into the final
+ QtWebKit library.
+
+ Reviewed by Simon Hausmann.
+
+ * WTF.pri:
+
2012-09-14 Ilya Tikhonovsky <[email protected]>
Web Inspector: NMI: convert template versions of String*::reportMemoryUsage functions to normal functions.
Modified: trunk/Source/WTF/WTF.pri (128615 => 128616)
--- trunk/Source/WTF/WTF.pri 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WTF/WTF.pri 2012-09-14 15:58:28 UTC (rev 128616)
@@ -36,3 +36,7 @@
# required for timegm
LIBS += -lnbutil
}
+
+mac {
+ LIBS += -framework AppKit
+}
Modified: trunk/Source/WebCore/ChangeLog (128615 => 128616)
--- trunk/Source/WebCore/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WebCore/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,15 @@
+2012-09-14 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Make force_static_libs_as_shared work on Mac OS
+
+ We had to move a few LIBS += around that were in the wrong place,
+ and not caught when everything was just linked into the final
+ QtWebKit library.
+
+ Reviewed by Simon Hausmann.
+
+ * WebCore.pri:
+
2012-09-14 Rick Byers <[email protected]>
Gesture events sent to wrong node when page is scrolled
Modified: trunk/Source/WebCore/WebCore.pri (128615 => 128616)
--- trunk/Source/WebCore/WebCore.pri 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WebCore/WebCore.pri 2012-09-14 15:58:28 UTC (rev 128616)
@@ -176,8 +176,21 @@
LIBS += -framework AppKit -framework AudioUnit \
-framework AudioToolbox -framework CoreAudio \
- -framework QuartzCore -framework QTKit
+ -framework QuartzCore -framework QTKit \
+ -framework Security -framework IOKit
+ # We can know the Mac OS version by using the Darwin major version
+ DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
+ DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
+ equals(DARWIN_MAJOR_VERSION, "12") {
+ LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
+ } else:equals(DARWIN_MAJOR_VERSION, "11") {
+ LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
+ } else:equals(DARWIN_MAJOR_VERSION, "10") {
+ LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+ } else:equals(DARWIN_MAJOR_VERSION, "9") {
+ LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+ }
} else:use?(GSTREAMER) {
INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
PKGCONFIG += gstreamer-video-0.10
@@ -217,7 +230,7 @@
use?(webp): LIBS += -lwebp
mac {
- LIBS += -framework Carbon -framework AppKit
+ LIBS += -framework Carbon -framework AppKit -framework IOKit
}
win32 {
Modified: trunk/Source/WebKit/ChangeLog (128615 => 128616)
--- trunk/Source/WebKit/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WebKit/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,15 @@
+2012-09-14 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Make force_static_libs_as_shared work on Mac OS
+
+ We had to move a few LIBS += around that were in the wrong place,
+ and not caught when everything was just linked into the final
+ QtWebKit library.
+
+ Reviewed by Simon Hausmann.
+
+ * WebKit1.pri: Move multimedia-stuff to WebCore, to share with WK2
+
2012-09-11 Raphael Kubo da Costa <[email protected]>
[EFL] Rewrite the EFL-related Find modules
Modified: trunk/Source/WebKit/WebKit1.pri (128615 => 128616)
--- trunk/Source/WebKit/WebKit1.pri 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Source/WebKit/WebKit1.pri 2012-09-14 15:58:28 UTC (rev 128616)
@@ -12,23 +12,6 @@
$$SOURCE_DIR/qt/WebCoreSupport \
$$ROOT_WEBKIT_DIR/Source/WTF/wtf/qt
-enable?(VIDEO):use?(QTKIT) {
- LIBS += -framework Security -framework IOKit
-
- # We can know the Mac OS version by using the Darwin major version
- DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
- DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
- equals(DARWIN_MAJOR_VERSION, "12") {
- LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
- } else:equals(DARWIN_MAJOR_VERSION, "11") {
- LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
- } else:equals(DARWIN_MAJOR_VERSION, "10") {
- LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
- } else:equals(DARWIN_MAJOR_VERSION, "9") {
- LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
- }
-}
-
enable?(DEVICE_ORIENTATION)|enable?(ORIENTATION_EVENTS) {
QT += sensors
}
Modified: trunk/Tools/ChangeLog (128615 => 128616)
--- trunk/Tools/ChangeLog 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Tools/ChangeLog 2012-09-14 15:58:28 UTC (rev 128616)
@@ -1,3 +1,16 @@
+2012-09-14 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Make force_static_libs_as_shared work on Mac OS
+
+ We had to move a few LIBS += around that were in the wrong place,
+ and not caught when everything was just linked into the final
+ QtWebKit library.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/force_static_libs_as_shared.prf:
+
2012-09-14 Simon Hausmann <[email protected]>
[Qt] Fix build of WTR on Windows
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (128615 => 128616)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-09-14 15:58:28 UTC (rev 128616)
@@ -189,8 +189,11 @@
force_static_libs_as_shared {
WEBKIT += wtf webcore
!v8: WEBKIT += _javascript_core
+ build?(webkit1): WEBKIT += webkit1
build?(webkit2): WEBKIT += webkit2
}
+
+ # FIXME: Replace this with putting the intermediate libraries in the prl file
}
contains(TARGET, $$resolveFinalLibraryName($${QT.webkit.name})): CONFIG += creating_module
Modified: trunk/Tools/qmake/mkspecs/features/force_static_libs_as_shared.prf (128615 => 128616)
--- trunk/Tools/qmake/mkspecs/features/force_static_libs_as_shared.prf 2012-09-14 15:55:08 UTC (rev 128615)
+++ trunk/Tools/qmake/mkspecs/features/force_static_libs_as_shared.prf 2012-09-14 15:58:28 UTC (rev 128616)
@@ -7,13 +7,16 @@
contains(TEMPLATE, lib) {
contains(CONFIG, staticlib) {
- CONFIG -= hide_symbols
- CONFIG -= staticlib
- CONFIG += rpath
- QMAKE_CXXFLAGS -= $$QMAKE_CXXFLAGS_HIDESYMS
- QMAKE_CFLAGS -= $$QMAKE_CFLAGS_HIDESYMS
- QMAKE_LFLAGS -= $$QMAKE_LFLAGS_HIDESYMS
- QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_OBJECTIVE_CFLAGS_HIDESYMS
- DESTDIR = $${ROOT_BUILD_DIR}/lib
+ CONFIG -= hide_symbols
+ CONFIG -= staticlib
+ CONFIG += rpath
+ QMAKE_CXXFLAGS -= $$QMAKE_CXXFLAGS_HIDESYMS
+ QMAKE_CFLAGS -= $$QMAKE_CFLAGS_HIDESYMS
+ QMAKE_LFLAGS -= $$QMAKE_LFLAGS_HIDESYMS
+ QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_OBJECTIVE_CFLAGS_HIDESYMS
+ DESTDIR = $${ROOT_BUILD_DIR}/lib
+
+ # Ensure the install-name of the libraries are correct on Mac OS
+ macx: QMAKE_LFLAGS_SONAME = $$QMAKE_LFLAGS_SONAME$${DESTDIR}/
}
}
