Diff
Modified: trunk/ChangeLog (104284 => 104285)
--- trunk/ChangeLog 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/ChangeLog 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,5 +1,32 @@
2012-01-06 Tor Arne Vestbø <[email protected]>
+ [Qt] Move listing of include paths and libs to pri files in sources
+
+ Includepaths are sometimes modified by non-Qt contributors so keeping
+ them in files inside Sources makes it more likely that they are updated
+ along with project files for the other ports.
+
+ Using pri files instead of prf files for this also has the benefit that
+ the include() from the main target file can be parsed and followed by
+ Qt Creator -- something that does not work with load().
+
+ Dependency from a target to a library through the WEBKIT variable are
+ handled through forwarding-files in Tools/qmake/mkspecs/modules, which
+ set the source root of the module and include the right pri file.
+
+ Ideally we'd use the variant of include() that takes an optional
+ namespace to read the variables into, or the fromfile() function,
+ but both of these add an overhead of about 40% on the total qmake
+ runtime, due to making a deep copy of all the variables in the
+ project or re-reading all the prf files from scratch.
+
+ Reviewed by Simon Hausmann.
+ Reviewed by Ossy.
+
+ * WebKit.pro:
+
+2012-01-06 Tor Arne Vestbø <[email protected]>
+
[Qt] Add a few more files ot OTHER_FILES
Rubber-stamped by Simon Hausmann.
Modified: trunk/Source/_javascript_Core/ChangeLog (104284 => 104285)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,3 +1,33 @@
+2012-01-06 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Move listing of include paths and libs to pri files in sources
+
+ Includepaths are sometimes modified by non-Qt contributors so keeping
+ them in files inside Sources makes it more likely that they are updated
+ along with project files for the other ports.
+
+ Using pri files instead of prf files for this also has the benefit that
+ the include() from the main target file can be parsed and followed by
+ Qt Creator -- something that does not work with load().
+
+ Dependency from a target to a library through the WEBKIT variable are
+ handled through forwarding-files in Tools/qmake/mkspecs/modules, which
+ set the source root of the module and include the right pri file.
+
+ Ideally we'd use the variant of include() that takes an optional
+ namespace to read the variables into, or the fromfile() function,
+ but both of these add an overhead of about 40% on the total qmake
+ runtime, due to making a deep copy of all the variables in the
+ project or re-reading all the prf files from scratch.
+
+ Reviewed by Simon Hausmann.
+ Reviewed by Ossy.
+
+ * _javascript_Core.pri: Renamed from Tools/qmake/mkspecs/features/_javascript_core.prf.
+ * Target.pri:
+ * wtf/wtf.pri: Renamed from Tools/qmake/mkspecs/features/wtf.prf.
+ * wtf/wtf.pro:
+
2012-01-06 Hajime Morrita <[email protected]>
WTF::String: Inline method shouldn't have WTF_EXPORT_PRIVATE
Copied: trunk/Source/_javascript_Core/_javascript_Core.pri (from rev 104284, trunk/Tools/qmake/mkspecs/features/_javascript_core.prf) (0 => 104285)
--- trunk/Source/_javascript_Core/_javascript_Core.pri (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,47 @@
+# -------------------------------------------------------------------
+# This file contains shared rules used both when building
+# _javascript_Core itself, and by targets that use _javascript_Core.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core
+
+_javascript_CORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/_javascript_Core/$${GENERATED_SOURCES_DESTDIR}
+
+INCLUDEPATH += \
+ $$SOURCE_DIR \
+ $$SOURCE_DIR/.. \
+ $$SOURCE_DIR/assembler \
+ $$SOURCE_DIR/bytecode \
+ $$SOURCE_DIR/bytecompiler \
+ $$SOURCE_DIR/heap \
+ $$SOURCE_DIR/dfg \
+ $$SOURCE_DIR/debugger \
+ $$SOURCE_DIR/interpreter \
+ $$SOURCE_DIR/jit \
+ $$SOURCE_DIR/parser \
+ $$SOURCE_DIR/profiler \
+ $$SOURCE_DIR/runtime \
+ $$SOURCE_DIR/yarr \
+ $$SOURCE_DIR/API \
+ $$SOURCE_DIR/ForwardingHeaders \
+ $$_javascript_CORE_GENERATED_SOURCES_DIR
+
+VPATH += $$SOURCE_DIR
+
+win32-* {
+ DEFINES += _HAS_TR1=0
+ LIBS += -lwinmm
+
+ win32-g++* {
+ LIBS += -lpthreadGC2
+ } else:win32-msvc* {
+ LIBS += -lpthreadVC2
+ }
+}
+
+wince* {
+ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
+ INCLUDEPATH += $$SOURCE_DIR/os-win32
+}
Modified: trunk/Source/_javascript_Core/Target.pri (104284 => 104285)
--- trunk/Source/_javascript_Core/Target.pri 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/_javascript_Core/Target.pri 2012-01-06 12:53:33 UTC (rev 104285)
@@ -7,7 +7,7 @@
TEMPLATE = lib
TARGET = _javascript_Core
-load(_javascript_core)
+include(_javascript_Core.pri)
WEBKIT += wtf
QT += core
Copied: trunk/Source/_javascript_Core/wtf/wtf.pri (from rev 104284, trunk/Tools/qmake/mkspecs/features/wtf.prf) (0 => 104285)
--- trunk/Source/_javascript_Core/wtf/wtf.pri (rev 0)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------
+# This file contains shared rules used both when building WTF itself
+# and for targets that depend in some way on WTF.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+load(features)
+
+SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core/wtf
+
+INCLUDEPATH += \
+ $$SOURCE_DIR/.. \
+ $$SOURCE_DIR \
+ $$SOURCE_DIR/gobject \
+ $$SOURCE_DIR/qt \
+ $$SOURCE_DIR/unicode
+
+VPATH += $$SOURCE_DIR
+
+contains(CONFIG, use_system_icu) {
+ DEFINES += WTF_USE_ICU_UNICODE=1
+ DEFINES -= WTF_USE_QT4_UNICODE
+ LIBS += -licuuc -licui18n
+} else {
+ DEFINES += WTF_USE_QT4_UNICODE=1
+ DEFINES -= WTF_USE_ICU_UNICODE
+}
+
+v8 {
+ !haveQt(5): error("To build QtWebKit+V8 you need to use Qt 5")
+ DEFINES *= WTF_USE_V8=1
+ INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/v8/ForwardingHeaders
+ QT += v8-private declarative
+}
+
+linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
+ !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+ DEFINES += ENABLE_GLIB_SUPPORT=1
+ PKGCONFIG += glib-2.0 gio-2.0
+ }
+}
+
+win32-*: LIBS += -lwinmm
Modified: trunk/Source/_javascript_Core/wtf/wtf.pro (104284 => 104285)
--- trunk/Source/_javascript_Core/wtf/wtf.pro 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/_javascript_Core/wtf/wtf.pro 2012-01-06 12:53:33 UTC (rev 104285)
@@ -7,7 +7,7 @@
TEMPLATE = lib
TARGET = WTF
-load(wtf)
+include(wtf.pri)
CONFIG += staticlib
Modified: trunk/Source/WebCore/ChangeLog (104284 => 104285)
--- trunk/Source/WebCore/ChangeLog 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/WebCore/ChangeLog 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,3 +1,31 @@
+2012-01-06 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Move listing of include paths and libs to pri files in sources
+
+ Includepaths are sometimes modified by non-Qt contributors so keeping
+ them in files inside Sources makes it more likely that they are updated
+ along with project files for the other ports.
+
+ Using pri files instead of prf files for this also has the benefit that
+ the include() from the main target file can be parsed and followed by
+ Qt Creator -- something that does not work with load().
+
+ Dependency from a target to a library through the WEBKIT variable are
+ handled through forwarding-files in Tools/qmake/mkspecs/modules, which
+ set the source root of the module and include the right pri file.
+
+ Ideally we'd use the variant of include() that takes an optional
+ namespace to read the variables into, or the fromfile() function,
+ but both of these add an overhead of about 40% on the total qmake
+ runtime, due to making a deep copy of all the variables in the
+ project or re-reading all the prf files from scratch.
+
+ Reviewed by Simon Hausmann.
+ Reviewed by Ossy.
+
+ * Target.pri:
+ * WebCore.pri: Renamed from Tools/qmake/mkspecs/features/webcore.prf.
+
2012-01-06 Adam Barth <[email protected]>
FrameDestructionObserver should be more full-service
Modified: trunk/Source/WebCore/Target.pri (104284 => 104285)
--- trunk/Source/WebCore/Target.pri 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/WebCore/Target.pri 2012-01-06 12:53:33 UTC (rev 104285)
@@ -7,7 +7,7 @@
TEMPLATE = lib
TARGET = WebCore
-load(webcore)
+include(WebCore.pri)
WEBKIT += wtf
!v8: WEBKIT += _javascript_core
Copied: trunk/Source/WebCore/WebCore.pri (from rev 104284, trunk/Tools/qmake/mkspecs/features/webcore.prf) (0 => 104285)
--- trunk/Source/WebCore/WebCore.pri (rev 0)
+++ trunk/Source/WebCore/WebCore.pri 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,258 @@
+# -------------------------------------------------------------------
+# This file contains shared rules used both when building WebCore
+# itself, and by targets that use WebCore.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+load(features)
+
+SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
+
+# We enable TextureMapper by default; remove this line to enable GraphicsLayerQt.
+CONFIG += texmap
+
+QT *= network sql
+
+WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR}
+
+INCLUDEPATH += \
+ $$SOURCE_DIR \
+ $$SOURCE_DIR/accessibility \
+ $$SOURCE_DIR/bindings \
+ $$SOURCE_DIR/bindings/generic \
+ $$SOURCE_DIR/bridge \
+ $$SOURCE_DIR/bridge/qt \
+ $$SOURCE_DIR/css \
+ $$SOURCE_DIR/dom \
+ $$SOURCE_DIR/dom/default \
+ $$SOURCE_DIR/editing \
+ $$SOURCE_DIR/fileapi \
+ $$SOURCE_DIR/history \
+ $$SOURCE_DIR/html \
+ $$SOURCE_DIR/html/canvas \
+ $$SOURCE_DIR/html/parser \
+ $$SOURCE_DIR/html/shadow \
+ $$SOURCE_DIR/html/track \
+ $$SOURCE_DIR/inspector \
+ $$SOURCE_DIR/loader \
+ $$SOURCE_DIR/loader/appcache \
+ $$SOURCE_DIR/loader/archive \
+ $$SOURCE_DIR/loader/cache \
+ $$SOURCE_DIR/loader/icon \
+ $$SOURCE_DIR/mathml \
+ $$SOURCE_DIR/notifications \
+ $$SOURCE_DIR/page \
+ $$SOURCE_DIR/page/qt \
+ $$SOURCE_DIR/page/animation \
+ $$SOURCE_DIR/platform \
+ $$SOURCE_DIR/platform/animation \
+ $$SOURCE_DIR/platform/audio \
+ $$SOURCE_DIR/platform/graphics \
+ $$SOURCE_DIR/platform/graphics/filters \
+ $$SOURCE_DIR/platform/graphics/filters/arm \
+ $$SOURCE_DIR/platform/graphics/opengl \
+ $$SOURCE_DIR/platform/graphics/qt \
+ $$SOURCE_DIR/platform/graphics/texmap \
+ $$SOURCE_DIR/platform/graphics/transforms \
+ $$SOURCE_DIR/platform/image-decoders \
+ $$SOURCE_DIR/platform/leveldb \
+ $$SOURCE_DIR/platform/mock \
+ $$SOURCE_DIR/platform/network \
+ $$SOURCE_DIR/platform/network/qt \
+ $$SOURCE_DIR/platform/qt \
+ $$SOURCE_DIR/platform/sql \
+ $$SOURCE_DIR/platform/text \
+ $$SOURCE_DIR/platform/text/transcoder \
+ $$SOURCE_DIR/plugins \
+ $$SOURCE_DIR/rendering \
+ $$SOURCE_DIR/rendering/mathml \
+ $$SOURCE_DIR/rendering/style \
+ $$SOURCE_DIR/rendering/svg \
+ $$SOURCE_DIR/storage \
+ $$SOURCE_DIR/svg \
+ $$SOURCE_DIR/svg/animation \
+ $$SOURCE_DIR/svg/graphics \
+ $$SOURCE_DIR/svg/graphics/filters \
+ $$SOURCE_DIR/svg/properties \
+ $$SOURCE_DIR/testing \
+ $$SOURCE_DIR/webaudio \
+ $$SOURCE_DIR/websockets \
+ $$SOURCE_DIR/workers \
+ $$SOURCE_DIR/xml \
+ $$SOURCE_DIR/xml/parser \
+ $$SOURCE_DIR/../ThirdParty
+
+v8 {
+ DEFINES *= V8_BINDING=1
+
+ INCLUDEPATH += \
+ $$SOURCE_DIR/bindings/v8 \
+ $$SOURCE_DIR/bindings/v8/custom \
+ $$SOURCE_DIR/bindings/v8/specialization \
+ $$SOURCE_DIR/bridge/qt/v8 \
+ $$SOURCE_DIR/testing/v8
+
+} else {
+ INCLUDEPATH += \
+ $$SOURCE_DIR/bridge/jsc \
+ $$SOURCE_DIR/bindings/js \
+ $$SOURCE_DIR/bindings/js/specialization \
+ $$SOURCE_DIR/bridge/c \
+ $$SOURCE_DIR/testing/js
+}
+
+INCLUDEPATH += $$WEBCORE_GENERATED_SOURCES_DIR
+
+contains(DEFINES, ENABLE_XSLT=1) {
+ contains(DEFINES, WTF_USE_LIBXML2=1) {
+ PKGCONFIG += libxslt
+ } else {
+ QT *= xmlpatterns
+ }
+}
+
+contains(DEFINES, WTF_USE_LIBXML2=1) {
+ PKGCONFIG += libxml-2.0
+}
+
+contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
+ unix {
+ mac {
+ INCLUDEPATH += platform/mac
+ # Note: XP_MACOSX is defined in npapi.h
+ } else {
+ !embedded {
+ CONFIG += x11
+ LIBS += -lXrender
+ }
+ DEFINES += XP_UNIX
+ DEFINES += ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE=1
+ }
+ }
+ win32-* {
+ LIBS += \
+ -ladvapi32 \
+ -lgdi32 \
+ -lshell32 \
+ -lshlwapi \
+ -luser32 \
+ -lversion
+ }
+}
+
+contains(DEFINES, ENABLE_GEOLOCATION=1) {
+ CONFIG *= mobility
+ MOBILITY *= location
+}
+
+contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
+ CONFIG *= mobility
+ MOBILITY *= sensors
+}
+
+contains(DEFINES, WTF_USE_QT_MOBILITY_SYSTEMINFO=1) {
+ CONFIG *= mobility
+ MOBILITY *= systeminfo
+}
+
+contains(DEFINES, ENABLE_VIDEO=1) {
+ contains(DEFINES, WTF_USE_QTKIT=1) {
+ INCLUDEPATH += $$SOURCE_DIR/platform/graphics/mac
+
+ LIBS += -framework AppKit -framework AudioUnit \
+ -framework AudioToolbox -framework CoreAudio \
+ -framework QuartzCore -framework QTKit
+
+ } else:contains(DEFINES, WTF_USE_GSTREAMER=1) {
+ DEFINES += ENABLE_GLIB_SUPPORT=1
+
+ INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
+
+ PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
+ } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
+ CONFIG *= mobility
+ MOBILITY *= multimedia
+ }
+}
+
+contains(DEFINES, ENABLE_WEBGL=1) {
+ !contains(QT_CONFIG, opengl) {
+ error( "This configuration needs an OpenGL enabled Qt. Your Qt is missing OpenGL.")
+ }
+ QT *= opengl
+}
+
+contains(CONFIG, texmap) {
+ DEFINES += WTF_USE_TEXTURE_MAPPER=1
+ !win32-*:contains(QT_CONFIG, opengl) {
+ DEFINES += WTF_USE_TEXTURE_MAPPER_GL
+ QT *= opengl
+ }
+}
+
+!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
+ INCLUDEPATH += $${SQLITE3SRCDIR}
+ DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
+ CONFIG(release, debug|release): DEFINES *= NDEBUG
+} else {
+ INCLUDEPATH += $${SQLITE3SRCDIR}
+ LIBS += -lsqlite3
+}
+
+win32-*|wince* {
+ DLLDESTDIR = $${ROOT_BUILD_DIR}/bin
+
+ dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
+ dlltarget.CONFIG = no_path
+ INSTALLS += dlltarget
+}
+mac {
+ LIBS += -framework Carbon -framework AppKit
+}
+
+win32-* {
+ INCLUDEPATH += $$SOURCE_DIR/platform/win
+ LIBS += -lgdi32
+ LIBS += -lole32
+ LIBS += -luser32
+}
+
+# Remove whole program optimizations due to miscompilations
+win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{
+ QMAKE_CFLAGS_RELEASE -= -GL
+ QMAKE_CXXFLAGS_RELEASE -= -GL
+
+ # Disable incremental linking for windows 32bit OS debug build as WebKit is so big
+ # that linker failes to link incrementally in debug mode.
+ ARCH = $$(PROCESSOR_ARCHITECTURE)
+ WOW64ARCH = $$(PROCESSOR_ARCHITEW6432)
+ equals(ARCH, x86):{
+ isEmpty(WOW64ARCH): QMAKE_LFLAGS_DEBUG += /INCREMENTAL:NO
+ }
+}
+
+wince* {
+ DEFINES += HAVE_LOCALTIME_S=0
+ LIBS += -lmmtimer
+ LIBS += -lole32
+}
+
+mac {
+ LIBS_PRIVATE += -framework Carbon -framework AppKit
+}
+
+unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
+linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+
+unix|win32-g++* {
+ QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
+ haveQt(5): QMAKE_PKGCONFIG_REQUIRES += QtWidgets
+}
+
+# Disable C++0x mode in WebCore for those who enabled it in their Qt's mkspec
+*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
+
+enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
+
Modified: trunk/Source/WebKit2/ChangeLog (104284 => 104285)
--- trunk/Source/WebKit2/ChangeLog 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,3 +1,31 @@
+2012-01-06 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Move listing of include paths and libs to pri files in sources
+
+ Includepaths are sometimes modified by non-Qt contributors so keeping
+ them in files inside Sources makes it more likely that they are updated
+ along with project files for the other ports.
+
+ Using pri files instead of prf files for this also has the benefit that
+ the include() from the main target file can be parsed and followed by
+ Qt Creator -- something that does not work with load().
+
+ Dependency from a target to a library through the WEBKIT variable are
+ handled through forwarding-files in Tools/qmake/mkspecs/modules, which
+ set the source root of the module and include the right pri file.
+
+ Ideally we'd use the variant of include() that takes an optional
+ namespace to read the variables into, or the fromfile() function,
+ but both of these add an overhead of about 40% on the total qmake
+ runtime, due to making a deep copy of all the variables in the
+ project or re-reading all the prf files from scratch.
+
+ Reviewed by Simon Hausmann.
+ Reviewed by Ossy.
+
+ * Target.pri:
+ * WebKit2.pri: Renamed from Tools/qmake/mkspecs/features/webkit2.prf.
+
2012-01-06 Zeno Albisser <[email protected]>
[Qt][WK2] Add test for application URL schemes.
Modified: trunk/Source/WebKit2/Target.pri (104284 => 104285)
--- trunk/Source/WebKit2/Target.pri 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/WebKit2/Target.pri 2012-01-06 12:53:33 UTC (rev 104285)
@@ -8,8 +8,9 @@
TARGET = WebKit2
load(features)
-load(webkit2)
+include(WebKit2.pri)
+
WEBKIT += wtf _javascript_core webcore
QT += declarative
Copied: trunk/Source/WebKit2/WebKit2.pri (from rev 104284, trunk/Tools/qmake/mkspecs/features/webkit2.prf) (0 => 104285)
--- trunk/Source/WebKit2/WebKit2.pri (rev 0)
+++ trunk/Source/WebKit2/WebKit2.pri 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,62 @@
+# -------------------------------------------------------------------
+# This file contains shared rules used both when building WebKit2
+# itself, and by targets that use WebKit2.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit2
+
+WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR}
+
+INCLUDEPATH += \
+ $$SOURCE_DIR \
+ $$SOURCE_DIR/Platform \
+ $$SOURCE_DIR/Platform/CoreIPC \
+ $$SOURCE_DIR/Platform/qt \
+ $$SOURCE_DIR/Shared \
+ $$SOURCE_DIR/Shared/API/c \
+ $$SOURCE_DIR/Shared/CoreIPCSupport \
+ $$SOURCE_DIR/Shared/Plugins \
+ $$SOURCE_DIR/Shared/Plugins/Netscape \
+ $$SOURCE_DIR/Shared/qt \
+ $$SOURCE_DIR/UIProcess \
+ $$SOURCE_DIR/UIProcess/API/C \
+ $$SOURCE_DIR/UIProcess/API/cpp \
+ $$SOURCE_DIR/UIProcess/API/cpp/qt \
+ $$SOURCE_DIR/UIProcess/API/qt \
+ $$SOURCE_DIR/UIProcess/Authentication \
+ $$SOURCE_DIR/UIProcess/Downloads \
+ $$SOURCE_DIR/UIProcess/Launcher \
+ $$SOURCE_DIR/UIProcess/Notifications \
+ $$SOURCE_DIR/UIProcess/Plugins \
+ $$SOURCE_DIR/UIProcess/qt \
+ $$SOURCE_DIR/WebProcess \
+ $$SOURCE_DIR/WebProcess/ApplicationCache \
+ $$SOURCE_DIR/WebProcess/Authentication \
+ $$SOURCE_DIR/WebProcess/Cookies \
+ $$SOURCE_DIR/WebProcess/Cookies/qt \
+ $$SOURCE_DIR/WebProcess/Downloads \
+ $$SOURCE_DIR/WebProcess/Downloads/qt \
+ $$SOURCE_DIR/WebProcess/FullScreen \
+ $$SOURCE_DIR/WebProcess/Geolocation \
+ $$SOURCE_DIR/WebProcess/IconDatabase \
+ $$SOURCE_DIR/WebProcess/InjectedBundle \
+ $$SOURCE_DIR/WebProcess/InjectedBundle/DOM \
+ $$SOURCE_DIR/WebProcess/InjectedBundle/API/c \
+ $$SOURCE_DIR/WebProcess/KeyValueStorage \
+ $$SOURCE_DIR/WebProcess/MediaCache \
+ $$SOURCE_DIR/WebProcess/Notifications \
+ $$SOURCE_DIR/WebProcess/Plugins \
+ $$SOURCE_DIR/WebProcess/Plugins/Netscape \
+ $$SOURCE_DIR/WebProcess/ResourceCache \
+ $$SOURCE_DIR/WebProcess/WebCoreSupport \
+ $$SOURCE_DIR/WebProcess/WebCoreSupport/qt \
+ $$SOURCE_DIR/WebProcess/WebPage \
+ $$SOURCE_DIR/WebProcess/qt \
+ $$SOURCE_DIR/PluginProcess
+
+# The WebKit2 Qt APIs depend on qwebkitglobal.h, which lives in WebKit
+INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/Api
+
+INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR
Modified: trunk/Tools/ChangeLog (104284 => 104285)
--- trunk/Tools/ChangeLog 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Tools/ChangeLog 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,3 +1,34 @@
+2012-01-06 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Move listing of include paths and libs to pri files in sources
+
+ Includepaths are sometimes modified by non-Qt contributors so keeping
+ them in files inside Sources makes it more likely that they are updated
+ along with project files for the other ports.
+
+ Using pri files instead of prf files for this also has the benefit that
+ the include() from the main target file can be parsed and followed by
+ Qt Creator -- something that does not work with load().
+
+ Dependency from a target to a library through the WEBKIT variable are
+ handled through forwarding-files in Tools/qmake/mkspecs/modules, which
+ set the source root of the module and include the right pri file.
+
+ Ideally we'd use the variant of include() that takes an optional
+ namespace to read the variables into, or the fromfile() function,
+ but both of these add an overhead of about 40% on the total qmake
+ runtime, due to making a deep copy of all the variables in the
+ project or re-reading all the prf files from scratch.
+
+ Reviewed by Simon Hausmann.
+ Reviewed by Ossy.
+
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/modules/_javascript_core.prf: Added.
+ * qmake/mkspecs/modules/webcore.prf: Added.
+ * qmake/mkspecs/modules/webkit2.prf: Added.
+ * qmake/mkspecs/modules/wtf.prf: Added.
+
2012-01-06 JungJik Lee <[email protected]>
[EFL] Add pre-render handling code in EWebLauncher.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (104284 => 104285)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -57,7 +57,8 @@
# We definitly need include paths and such (this will set
# SOURCE_DIR to the right path so we can use it below).
- load($$lower($$library))
+ library_identifier = $$lower($$library)
+ include(../modules/$${library_identifier}.prf)
# More juggling
dependent_libs = $$LIBS
@@ -65,7 +66,7 @@
# But we might also need to link against it
needToLink() {
- linkAgainstLibrary($$library, $$SOURCE_DIR)
+ linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
LIBS += $$dependent_libs
}
Deleted: trunk/Tools/qmake/mkspecs/features/_javascript_core.prf (104284 => 104285)
--- trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,47 +0,0 @@
-# -------------------------------------------------------------------
-# This file contains shared rules used both when building
-# _javascript_Core itself, and by targets that use _javascript_Core.
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core
-
-_javascript_CORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/_javascript_Core/$${GENERATED_SOURCES_DESTDIR}
-
-INCLUDEPATH += \
- $$SOURCE_DIR \
- $$SOURCE_DIR/.. \
- $$SOURCE_DIR/assembler \
- $$SOURCE_DIR/bytecode \
- $$SOURCE_DIR/bytecompiler \
- $$SOURCE_DIR/heap \
- $$SOURCE_DIR/dfg \
- $$SOURCE_DIR/debugger \
- $$SOURCE_DIR/interpreter \
- $$SOURCE_DIR/jit \
- $$SOURCE_DIR/parser \
- $$SOURCE_DIR/profiler \
- $$SOURCE_DIR/runtime \
- $$SOURCE_DIR/yarr \
- $$SOURCE_DIR/API \
- $$SOURCE_DIR/ForwardingHeaders \
- $$_javascript_CORE_GENERATED_SOURCES_DIR
-
-VPATH += $$SOURCE_DIR
-
-win32-* {
- DEFINES += _HAS_TR1=0
- LIBS += -lwinmm
-
- win32-g++* {
- LIBS += -lpthreadGC2
- } else:win32-msvc* {
- LIBS += -lpthreadVC2
- }
-}
-
-wince* {
- INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
- INCLUDEPATH += $$SOURCE_DIR/os-win32
-}
Deleted: trunk/Tools/qmake/mkspecs/features/webcore.prf (104284 => 104285)
--- trunk/Tools/qmake/mkspecs/features/webcore.prf 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,258 +0,0 @@
-# -------------------------------------------------------------------
-# This file contains shared rules used both when building WebCore
-# itself, and by targets that use WebCore.
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-load(features)
-
-SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
-
-# We enable TextureMapper by default; remove this line to enable GraphicsLayerQt.
-CONFIG += texmap
-
-QT *= network sql
-
-WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR}
-
-INCLUDEPATH += \
- $$SOURCE_DIR \
- $$SOURCE_DIR/accessibility \
- $$SOURCE_DIR/bindings \
- $$SOURCE_DIR/bindings/generic \
- $$SOURCE_DIR/bridge \
- $$SOURCE_DIR/bridge/qt \
- $$SOURCE_DIR/css \
- $$SOURCE_DIR/dom \
- $$SOURCE_DIR/dom/default \
- $$SOURCE_DIR/editing \
- $$SOURCE_DIR/fileapi \
- $$SOURCE_DIR/history \
- $$SOURCE_DIR/html \
- $$SOURCE_DIR/html/canvas \
- $$SOURCE_DIR/html/parser \
- $$SOURCE_DIR/html/shadow \
- $$SOURCE_DIR/html/track \
- $$SOURCE_DIR/inspector \
- $$SOURCE_DIR/loader \
- $$SOURCE_DIR/loader/appcache \
- $$SOURCE_DIR/loader/archive \
- $$SOURCE_DIR/loader/cache \
- $$SOURCE_DIR/loader/icon \
- $$SOURCE_DIR/mathml \
- $$SOURCE_DIR/notifications \
- $$SOURCE_DIR/page \
- $$SOURCE_DIR/page/qt \
- $$SOURCE_DIR/page/animation \
- $$SOURCE_DIR/platform \
- $$SOURCE_DIR/platform/animation \
- $$SOURCE_DIR/platform/audio \
- $$SOURCE_DIR/platform/graphics \
- $$SOURCE_DIR/platform/graphics/filters \
- $$SOURCE_DIR/platform/graphics/filters/arm \
- $$SOURCE_DIR/platform/graphics/opengl \
- $$SOURCE_DIR/platform/graphics/qt \
- $$SOURCE_DIR/platform/graphics/texmap \
- $$SOURCE_DIR/platform/graphics/transforms \
- $$SOURCE_DIR/platform/image-decoders \
- $$SOURCE_DIR/platform/leveldb \
- $$SOURCE_DIR/platform/mock \
- $$SOURCE_DIR/platform/network \
- $$SOURCE_DIR/platform/network/qt \
- $$SOURCE_DIR/platform/qt \
- $$SOURCE_DIR/platform/sql \
- $$SOURCE_DIR/platform/text \
- $$SOURCE_DIR/platform/text/transcoder \
- $$SOURCE_DIR/plugins \
- $$SOURCE_DIR/rendering \
- $$SOURCE_DIR/rendering/mathml \
- $$SOURCE_DIR/rendering/style \
- $$SOURCE_DIR/rendering/svg \
- $$SOURCE_DIR/storage \
- $$SOURCE_DIR/svg \
- $$SOURCE_DIR/svg/animation \
- $$SOURCE_DIR/svg/graphics \
- $$SOURCE_DIR/svg/graphics/filters \
- $$SOURCE_DIR/svg/properties \
- $$SOURCE_DIR/testing \
- $$SOURCE_DIR/webaudio \
- $$SOURCE_DIR/websockets \
- $$SOURCE_DIR/workers \
- $$SOURCE_DIR/xml \
- $$SOURCE_DIR/xml/parser \
- $$SOURCE_DIR/../ThirdParty
-
-v8 {
- DEFINES *= V8_BINDING=1
-
- INCLUDEPATH += \
- $$SOURCE_DIR/bindings/v8 \
- $$SOURCE_DIR/bindings/v8/custom \
- $$SOURCE_DIR/bindings/v8/specialization \
- $$SOURCE_DIR/bridge/qt/v8 \
- $$SOURCE_DIR/testing/v8
-
-} else {
- INCLUDEPATH += \
- $$SOURCE_DIR/bridge/jsc \
- $$SOURCE_DIR/bindings/js \
- $$SOURCE_DIR/bindings/js/specialization \
- $$SOURCE_DIR/bridge/c \
- $$SOURCE_DIR/testing/js
-}
-
-INCLUDEPATH += $$WEBCORE_GENERATED_SOURCES_DIR
-
-contains(DEFINES, ENABLE_XSLT=1) {
- contains(DEFINES, WTF_USE_LIBXML2=1) {
- PKGCONFIG += libxslt
- } else {
- QT *= xmlpatterns
- }
-}
-
-contains(DEFINES, WTF_USE_LIBXML2=1) {
- PKGCONFIG += libxml-2.0
-}
-
-contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
- unix {
- mac {
- INCLUDEPATH += platform/mac
- # Note: XP_MACOSX is defined in npapi.h
- } else {
- !embedded {
- CONFIG += x11
- LIBS += -lXrender
- }
- DEFINES += XP_UNIX
- DEFINES += ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE=1
- }
- }
- win32-* {
- LIBS += \
- -ladvapi32 \
- -lgdi32 \
- -lshell32 \
- -lshlwapi \
- -luser32 \
- -lversion
- }
-}
-
-contains(DEFINES, ENABLE_GEOLOCATION=1) {
- CONFIG *= mobility
- MOBILITY *= location
-}
-
-contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
- CONFIG *= mobility
- MOBILITY *= sensors
-}
-
-contains(DEFINES, WTF_USE_QT_MOBILITY_SYSTEMINFO=1) {
- CONFIG *= mobility
- MOBILITY *= systeminfo
-}
-
-contains(DEFINES, ENABLE_VIDEO=1) {
- contains(DEFINES, WTF_USE_QTKIT=1) {
- INCLUDEPATH += $$SOURCE_DIR/platform/graphics/mac
-
- LIBS += -framework AppKit -framework AudioUnit \
- -framework AudioToolbox -framework CoreAudio \
- -framework QuartzCore -framework QTKit
-
- } else:contains(DEFINES, WTF_USE_GSTREAMER=1) {
- DEFINES += ENABLE_GLIB_SUPPORT=1
-
- INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
-
- PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
- } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
- CONFIG *= mobility
- MOBILITY *= multimedia
- }
-}
-
-contains(DEFINES, ENABLE_WEBGL=1) {
- !contains(QT_CONFIG, opengl) {
- error( "This configuration needs an OpenGL enabled Qt. Your Qt is missing OpenGL.")
- }
- QT *= opengl
-}
-
-contains(CONFIG, texmap) {
- DEFINES += WTF_USE_TEXTURE_MAPPER=1
- !win32-*:contains(QT_CONFIG, opengl) {
- DEFINES += WTF_USE_TEXTURE_MAPPER_GL
- QT *= opengl
- }
-}
-
-!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
- INCLUDEPATH += $${SQLITE3SRCDIR}
- DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
- CONFIG(release, debug|release): DEFINES *= NDEBUG
-} else {
- INCLUDEPATH += $${SQLITE3SRCDIR}
- LIBS += -lsqlite3
-}
-
-win32-*|wince* {
- DLLDESTDIR = $${ROOT_BUILD_DIR}/bin
-
- dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
- dlltarget.CONFIG = no_path
- INSTALLS += dlltarget
-}
-mac {
- LIBS += -framework Carbon -framework AppKit
-}
-
-win32-* {
- INCLUDEPATH += $$SOURCE_DIR/platform/win
- LIBS += -lgdi32
- LIBS += -lole32
- LIBS += -luser32
-}
-
-# Remove whole program optimizations due to miscompilations
-win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{
- QMAKE_CFLAGS_RELEASE -= -GL
- QMAKE_CXXFLAGS_RELEASE -= -GL
-
- # Disable incremental linking for windows 32bit OS debug build as WebKit is so big
- # that linker failes to link incrementally in debug mode.
- ARCH = $$(PROCESSOR_ARCHITECTURE)
- WOW64ARCH = $$(PROCESSOR_ARCHITEW6432)
- equals(ARCH, x86):{
- isEmpty(WOW64ARCH): QMAKE_LFLAGS_DEBUG += /INCREMENTAL:NO
- }
-}
-
-wince* {
- DEFINES += HAVE_LOCALTIME_S=0
- LIBS += -lmmtimer
- LIBS += -lole32
-}
-
-mac {
- LIBS_PRIVATE += -framework Carbon -framework AppKit
-}
-
-unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
-
-unix|win32-g++* {
- QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
- haveQt(5): QMAKE_PKGCONFIG_REQUIRES += QtWidgets
-}
-
-# Disable C++0x mode in WebCore for those who enabled it in their Qt's mkspec
-*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
-
-enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
-
Deleted: trunk/Tools/qmake/mkspecs/features/webkit2.prf (104284 => 104285)
--- trunk/Tools/qmake/mkspecs/features/webkit2.prf 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Tools/qmake/mkspecs/features/webkit2.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,62 +0,0 @@
-# -------------------------------------------------------------------
-# This file contains shared rules used both when building WebKit2
-# itself, and by targets that use WebKit2.
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit2
-
-WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR}
-
-INCLUDEPATH += \
- $$SOURCE_DIR \
- $$SOURCE_DIR/Platform \
- $$SOURCE_DIR/Platform/CoreIPC \
- $$SOURCE_DIR/Platform/qt \
- $$SOURCE_DIR/Shared \
- $$SOURCE_DIR/Shared/API/c \
- $$SOURCE_DIR/Shared/CoreIPCSupport \
- $$SOURCE_DIR/Shared/Plugins \
- $$SOURCE_DIR/Shared/Plugins/Netscape \
- $$SOURCE_DIR/Shared/qt \
- $$SOURCE_DIR/UIProcess \
- $$SOURCE_DIR/UIProcess/API/C \
- $$SOURCE_DIR/UIProcess/API/cpp \
- $$SOURCE_DIR/UIProcess/API/cpp/qt \
- $$SOURCE_DIR/UIProcess/API/qt \
- $$SOURCE_DIR/UIProcess/Authentication \
- $$SOURCE_DIR/UIProcess/Downloads \
- $$SOURCE_DIR/UIProcess/Launcher \
- $$SOURCE_DIR/UIProcess/Notifications \
- $$SOURCE_DIR/UIProcess/Plugins \
- $$SOURCE_DIR/UIProcess/qt \
- $$SOURCE_DIR/WebProcess \
- $$SOURCE_DIR/WebProcess/ApplicationCache \
- $$SOURCE_DIR/WebProcess/Authentication \
- $$SOURCE_DIR/WebProcess/Cookies \
- $$SOURCE_DIR/WebProcess/Cookies/qt \
- $$SOURCE_DIR/WebProcess/Downloads \
- $$SOURCE_DIR/WebProcess/Downloads/qt \
- $$SOURCE_DIR/WebProcess/FullScreen \
- $$SOURCE_DIR/WebProcess/Geolocation \
- $$SOURCE_DIR/WebProcess/IconDatabase \
- $$SOURCE_DIR/WebProcess/InjectedBundle \
- $$SOURCE_DIR/WebProcess/InjectedBundle/DOM \
- $$SOURCE_DIR/WebProcess/InjectedBundle/API/c \
- $$SOURCE_DIR/WebProcess/KeyValueStorage \
- $$SOURCE_DIR/WebProcess/MediaCache \
- $$SOURCE_DIR/WebProcess/Notifications \
- $$SOURCE_DIR/WebProcess/Plugins \
- $$SOURCE_DIR/WebProcess/Plugins/Netscape \
- $$SOURCE_DIR/WebProcess/ResourceCache \
- $$SOURCE_DIR/WebProcess/WebCoreSupport \
- $$SOURCE_DIR/WebProcess/WebCoreSupport/qt \
- $$SOURCE_DIR/WebProcess/WebPage \
- $$SOURCE_DIR/WebProcess/qt \
- $$SOURCE_DIR/PluginProcess
-
-# The WebKit2 Qt APIs depend on qwebkitglobal.h, which lives in WebKit
-INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/Api
-
-INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR
Deleted: trunk/Tools/qmake/mkspecs/features/wtf.prf (104284 => 104285)
--- trunk/Tools/qmake/mkspecs/features/wtf.prf 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Tools/qmake/mkspecs/features/wtf.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,43 +0,0 @@
-# -------------------------------------------------------------------
-# This file contains shared rules used both when building against WTF
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-load(features)
-
-SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core/wtf
-
-INCLUDEPATH += \
- $$SOURCE_DIR/.. \
- $$SOURCE_DIR \
- $$SOURCE_DIR/gobject \
- $$SOURCE_DIR/qt \
- $$SOURCE_DIR/unicode
-
-VPATH += $$SOURCE_DIR
-
-contains(CONFIG, use_system_icu) {
- DEFINES += WTF_USE_ICU_UNICODE=1
- DEFINES -= WTF_USE_QT4_UNICODE
- LIBS += -licuuc -licui18n
-} else {
- DEFINES += WTF_USE_QT4_UNICODE=1
- DEFINES -= WTF_USE_ICU_UNICODE
-}
-
-v8 {
- !haveQt(5): error("To build QtWebKit+V8 you need to use Qt 5")
- DEFINES *= WTF_USE_V8=1
- INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/v8/ForwardingHeaders
- QT += v8-private declarative
-}
-
-linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
- DEFINES += ENABLE_GLIB_SUPPORT=1
- PKGCONFIG += glib-2.0 gio-2.0
- }
-}
-
-win32-*: LIBS += -lwinmm
Added: trunk/Tools/qmake/mkspecs/modules/_javascript_core.prf (0 => 104285)
--- trunk/Tools/qmake/mkspecs/modules/_javascript_core.prf (rev 0)
+++ trunk/Tools/qmake/mkspecs/modules/_javascript_core.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,10 @@
+# -------------------------------------------------------------------
+# Module file for _javascript_Core, used by targets that depend on
+# _javascript_Core
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+WEBKIT._javascript_core.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core
+
+include($${WEBKIT._javascript_core.root_source_dir}/_javascript_Core.pri)
Added: trunk/Tools/qmake/mkspecs/modules/webcore.prf (0 => 104285)
--- trunk/Tools/qmake/mkspecs/modules/webcore.prf (rev 0)
+++ trunk/Tools/qmake/mkspecs/modules/webcore.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,9 @@
+# -------------------------------------------------------------------
+# Module file for WebCore, used by targets that depend on WebCore
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+WEBKIT.webcore.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/WebCore
+
+include($${WEBKIT.webcore.root_source_dir}/WebCore.pri)
Added: trunk/Tools/qmake/mkspecs/modules/webkit2.prf (0 => 104285)
--- trunk/Tools/qmake/mkspecs/modules/webkit2.prf (rev 0)
+++ trunk/Tools/qmake/mkspecs/modules/webkit2.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,9 @@
+# -------------------------------------------------------------------
+# Module file for WebKit2, used by targets that depend on WebKit2
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+WEBKIT.webkit2.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/WebKit2
+
+include($${WEBKIT.webkit2.root_source_dir}/WebKit2.pri)
Added: trunk/Tools/qmake/mkspecs/modules/wtf.prf (0 => 104285)
--- trunk/Tools/qmake/mkspecs/modules/wtf.prf (rev 0)
+++ trunk/Tools/qmake/mkspecs/modules/wtf.prf 2012-01-06 12:53:33 UTC (rev 104285)
@@ -0,0 +1,9 @@
+# -------------------------------------------------------------------
+# Module file for WTF, used by targets that depend on WTF
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+WEBKIT.wtf.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core/wtf
+
+include($${WEBKIT.wtf.root_source_dir}/wtf.pri)
Modified: trunk/WebKit.pro (104284 => 104285)
--- trunk/WebKit.pro 2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/WebKit.pro 2012-01-06 12:53:33 UTC (rev 104285)
@@ -37,10 +37,10 @@
OTHER_FILES = \
Tools/qmake/README \
- Tools/qmake/mkspecs/modules/qt_webkit.pri \
Tools/qmake/configure.pro \
Tools/qmake/sync.profile \
Tools/qmake/config.tests/fontconfig/* \
+ Tools/qmake/mkspecs/modules/* \
Tools/qmake/mkspecs/features/*.prf \
Tools/qmake/mkspecs/features/mac/*.prf \
Tools/qmake/mkspecs/features/unix/*.prf \
