[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hausmann at webkit.org
hausmann at webkit.org
Thu Apr 8 00:42:10 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 903f8391daa0c9901307ea24d3216083a034c3c5
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 18 17:06:24 2009 +0000
[Qt] Clean up the qmake build system to distinguish between trunk builds and package builds
Reviewed by Tor Arne Vestbø.
https://bugs.webkit.org/show_bug.cgi?id=32716
.:
* WebKit.pri: Use standalone_package instead of QTDIR_build
JavaScriptCore:
* pcre/pcre.pri: Use standalone_package instead of QTDIR_build
WebCore:
Introduce standalone_package as config that is set when QTDIR_build is set or when
the directory for the generated files is present.
Renamed uses of QTDIR_build that apply to generic package builds to use standalone_package.
Others remain as they are specific to building inside Qt.
* WebCore.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52313 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 0bb75ae..ec3abc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-18 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Clean up the qmake build system to distinguish between trunk builds and package builds
+
+ https://bugs.webkit.org/show_bug.cgi?id=32716
+
+ * WebKit.pri: Use standalone_package instead of QTDIR_build
+
2009-12-17 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Unreviewed. Build fixes for make distcheck.
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c4104df..38d5c3d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-18 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Clean up the qmake build system to distinguish between trunk builds and package builds
+
+ https://bugs.webkit.org/show_bug.cgi?id=32716
+
+ * pcre/pcre.pri: Use standalone_package instead of QTDIR_build
+
2009-12-18 Martin Robinson <martin.james.robinson at gmail.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/JavaScriptCore/pcre/pcre.pri b/JavaScriptCore/pcre/pcre.pri
index c33c67c..093e0e6 100644
--- a/JavaScriptCore/pcre/pcre.pri
+++ b/JavaScriptCore/pcre/pcre.pri
@@ -12,7 +12,7 @@ SOURCES += \
pcre_ucp_searchfuncs.cpp \
pcre_xclass.cpp
-!CONFIG(QTDIR_build) {
+!CONFIG(standalone_package) {
defineTest(addExtraCompiler) {
QMAKE_EXTRA_COMPILERS += $$1
generated_files.depends += compiler_$${1}_make_all
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 24f68b9..f1ac9d6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -88,6 +88,22 @@
Reviewed by Tor Arne Vestbø.
+ [Qt] Clean up the qmake build system to distinguish between trunk builds and package builds
+
+ https://bugs.webkit.org/show_bug.cgi?id=32716
+
+ Introduce standalone_package as config that is set when QTDIR_build is set or when
+ the directory for the generated files is present.
+
+ Renamed uses of QTDIR_build that apply to generic package builds to use standalone_package.
+ Others remain as they are specific to building inside Qt.
+
+ * WebCore.pro:
+
+2009-12-18 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
[Qt] Fix the build on Symbian.
Use QFont::lastRestortFamily() instead of QFont::lastRestortFont(),
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4403dc6..6d3d5de 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -27,9 +27,17 @@ TARGET = QtWebKit
contains(QT_CONFIG, embedded):CONFIG += embedded
-CONFIG(QTDIR_build) {
+# Detect that we are building as a standalone package by the presence of
+# either the generated files directory or as part of the Qt package through
+# QTDIR_build
+CONFIG(QTDIR_build): CONFIG += standalone_package
+else:exists($$PWD/generated): CONFIG += standalone_package
+
+CONFIG(standalone_package) {
GENERATED_SOURCES_DIR = $$PWD/generated
- include($$QT_SOURCE_TREE/src/qbase.pri)
+
+ CONFIG(QTDIR_build):include($$QT_SOURCE_TREE/src/qbase.pri)
+
PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
DEFINES *= NDEBUG
} else {
@@ -55,7 +63,7 @@ unix {
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-CONFIG(release):!CONFIG(QTDIR_build) {
+CONFIG(release):!CONFIG(standalone_package) {
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
}
@@ -3350,7 +3358,7 @@ addExtraCompiler(webkitversion)
include($$PWD/../WebKit/qt/Api/headers.pri)
HEADERS += $$WEBKIT_API_HEADERS
-!CONFIG(QTDIR_build) {
+!CONFIG(standalone_package) {
target.path = $$[QT_INSTALL_LIBS]
headers.files = $$WEBKIT_API_HEADERS
headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
@@ -3401,7 +3409,7 @@ HEADERS += $$WEBKIT_API_HEADERS
}
}
-CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
+CONFIG(standalone_package):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
# start with 4.5
# Remove the following 2 lines if you want debug information in WebCore
CONFIG -= separate_debug_info
diff --git a/WebKit.pri b/WebKit.pri
index d7abc54..70fdce8 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -80,7 +80,7 @@ win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -
# all the extra compilers to generate all the necessary files for the build using 'make generated_files'
#
defineTest(addExtraCompiler) {
- CONFIG(QTDIR_build) {
+ CONFIG(standalone_package) {
outputRule = $$eval($${1}.output)
outVariable = $$eval($${1}.variable_out)
!isEqual(outVariable,GENERATED_SOURCES):return(true)
@@ -128,7 +128,7 @@ defineTest(addExtraCompilerWithHeader) {
export($${1}_header.depends)
export($${1}_header.variable_out)
- !CONFIG(QTDIR_build): QMAKE_EXTRA_COMPILERS += $${1}_header
+ !CONFIG(standalone_package): QMAKE_EXTRA_COMPILERS += $${1}_header
export(QMAKE_EXTRA_COMPILERS)
export(generated_files.depends)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list