Commit 8de23a30 authored by vestbo@webkit.org's avatar vestbo@webkit.org
Browse files

[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128616 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 585f6a68
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[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 <kevin.funk@kdab.com>
 
Fix interpreter build
......
......@@ -19,10 +19,6 @@ WEBKIT += javascriptcore wtf
SOURCES = jsc.cpp
mac {
LIBS_PRIVATE += -framework AppKit
}
win32-* {
LIBS += -ladvapi32
}
......
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[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 <loislo@chromium.org>
Web Inspector: NMI: convert template versions of String*::reportMemoryUsage functions to normal functions.
......
......@@ -36,3 +36,7 @@ qnx {
# required for timegm
LIBS += -lnbutil
}
mac {
LIBS += -framework AppKit
}
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[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 <rbyers@chromium.org>
 
Gesture events sent to wrong node when page is scrolled
......@@ -176,8 +176,21 @@ enable?(VIDEO) {
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?(libpng): LIBS += -lpng
use?(webp): LIBS += -lwebp
mac {
LIBS += -framework Carbon -framework AppKit
LIBS += -framework Carbon -framework AppKit -framework IOKit
}
win32 {
......
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[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 <rakuco@webkit.org>
[EFL] Rewrite the EFL-related Find modules
......
......@@ -12,23 +12,6 @@ INCLUDEPATH += \
$$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
}
......
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[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 <simon.hausmann@nokia.com>
 
[Qt] Fix build of WTR on Windows
......
......@@ -189,8 +189,11 @@ contains(QT, webkit) {
force_static_libs_as_shared {
WEBKIT += wtf webcore
!v8: WEBKIT += javascriptcore
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
......
......@@ -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}/
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment