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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@104285
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2012-01-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
+
+ [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ø <tor.arne.vestbo@nokia.com>
[Qt] Add a few more files ot OTHER_FILES
+2012-01-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
+
+ [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.
+
+ * JavaScriptCore.pri: Renamed from Tools/qmake/mkspecs/features/javascriptcore.prf.
+ * Target.pri:
+ * wtf/wtf.pri: Renamed from Tools/qmake/mkspecs/features/wtf.prf.
+ * wtf/wtf.pro:
+
2012-01-06 Hajime Morrita <morrita@chromium.org>
WTF::String: Inline method shouldn't have WTF_EXPORT_PRIVATE
TEMPLATE = lib
TARGET = JavaScriptCore
-load(javascriptcore)
+include(JavaScriptCore.pri)
WEBKIT += wtf
QT += core
# -------------------------------------------------------------------
-# This file contains shared rules used both when building against WTF
+# 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
# -------------------------------------------------------------------
TEMPLATE = lib
TARGET = WTF
-load(wtf)
+include(wtf.pri)
CONFIG += staticlib
+2012-01-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
+
+ [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 <abarth@webkit.org>
FrameDestructionObserver should be more full-service
TEMPLATE = lib
TARGET = WebCore
-load(webcore)
+include(WebCore.pri)
WEBKIT += wtf
!v8: WEBKIT += javascriptcore
+2012-01-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
+
+ [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 <zeno@webkit.org>
[Qt][WK2] Add test for application URL schemes.
TARGET = WebKit2
load(features)
-load(webkit2)
+
+include(WebKit2.pri)
WEBKIT += wtf javascriptcore webcore
QT += declarative
+2012-01-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
+
+ [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/javascriptcore.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 <jungjik.lee@samsung.com>
[EFL] Add pre-render handling code in EWebLauncher.
# 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
# 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
}
--- /dev/null
+# -------------------------------------------------------------------
+# Module file for JavaScriptCore, used by targets that depend on
+# JavaScriptCore
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+WEBKIT.javascriptcore.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore
+
+include($${WEBKIT.javascriptcore.root_source_dir}/JavaScriptCore.pri)
--- /dev/null
+# -------------------------------------------------------------------
+# 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)
--- /dev/null
+# -------------------------------------------------------------------
+# 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)
--- /dev/null
+# -------------------------------------------------------------------
+# 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/JavaScriptCore/wtf
+
+include($${WEBKIT.wtf.root_source_dir}/wtf.pri)
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 \
git://git.webkit.org / WebKit-https.git / commitdiff