Diff
Modified: trunk/Source/WebCore/ChangeLog (121957 => 121958)
--- trunk/Source/WebCore/ChangeLog 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Source/WebCore/ChangeLog 2012-07-06 13:10:45 UTC (rev 121958)
@@ -1,3 +1,15 @@
+2012-07-06 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+
+ [Qt] Switch to new-style Qt 5 configure tests
+
+ Use explicit project file action instead of syncqt magic.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebCore.pri:
+
2012-07-06 Pavel Feldman <pfeld...@chromium.org>
Web Inspector: start searching from the cursor position in the Sources panel.
Modified: trunk/Source/WebCore/WebCore.pri (121957 => 121958)
--- trunk/Source/WebCore/WebCore.pri 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Source/WebCore/WebCore.pri 2012-07-06 13:10:45 UTC (rev 121958)
@@ -235,19 +235,19 @@
haveQt(5) {
# Qt5 allows us to use config tests to check for the presence of these libraries
- contains(config_test_libjpeg, yes) {
+ config_libjpeg {
DEFINES += WTF_USE_LIBJPEG=1
LIBS += -ljpeg
} else {
warning("JPEG library not found! QImageDecoder will decode JPEG images.")
}
- contains(config_test_libpng, yes) {
+ config_libpng {
DEFINES += WTF_USE_LIBPNG=1
LIBS += -lpng
} else {
warning("PNG library not found! QImageDecoder will decode PNG images.")
}
- contains(config_test_libwebp, yes) {
+ config_libwebp {
DEFINES += WTF_USE_WEBP=1
LIBS += -lwebp
}
Modified: trunk/Tools/ChangeLog (121957 => 121958)
--- trunk/Tools/ChangeLog 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Tools/ChangeLog 2012-07-06 13:10:45 UTC (rev 121958)
@@ -1,3 +1,21 @@
+2012-07-06 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+
+ [Qt] Switch to new-style Qt 5 configure tests
+
+ Use explicit project file action instead of syncqt magic.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+ * qmake/configure.pri: Copied from Tools/qmake/configure.pro.
+ * qmake/configure.pro:
+ * qmake/mkspecs/features/default_pre.prf:
+ * qmake/mkspecs/features/features.prf:
+ * qmake/sync.profile: Removed.
+
2012-07-05 Jason Liu <jason....@torchmobile.com.cn>
Add Jason Liu to committers.py.
Modified: trunk/Tools/Scripts/webkitdirs.pm (121957 => 121958)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-07-06 13:10:45 UTC (rev 121958)
@@ -2373,10 +2373,6 @@
File::Path::rmtree($dir);
File::Path::mkpath($dir);
chdir $dir or die "Failed to cd into " . $dir . "\n";
-
- # After removing WebKitBuild directory, we have to call qtFeatureDefaults()
- # to run config tests and generate the removed Tools/qmake/.qmake.cache again.
- qtFeatureDefaults(\@buildArgs, \$qconfigs);
#}
# Still trigger an incremental build
Modified: trunk/Tools/Tools.pro (121957 => 121958)
--- trunk/Tools/Tools.pro 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Tools/Tools.pro 2012-07-06 13:10:45 UTC (rev 121958)
@@ -35,8 +35,7 @@
$$files(Scripts/webkitpy/*.py, true) \
$$files(Scripts/webkitperl/*.p[l|m], true) \
qmake/README \
- qmake/configure.pro \
- qmake/sync.profile \
+ qmake/configure.* \
qmake/qt_webkit.pri \
qmake/config.tests/README \
qmake/config.tests/fontconfig/* \
Copied: trunk/Tools/qmake/configure.pri (from rev 121957, trunk/Tools/qmake/configure.pro) (0 => 121958)
--- trunk/Tools/qmake/configure.pri (rev 0)
+++ trunk/Tools/qmake/configure.pri 2012-07-06 13:10:45 UTC (rev 121958)
@@ -0,0 +1,25 @@
+# -------------------------------------------------------------------
+# This file is used by build-webkit to compute the various feature
+# defines, which are then cached in .qmake.cache.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+haveQt(5) {
+ load(configure)
+ QMAKE_CONFIG_TESTS_DIR = $$PWD/config.tests
+
+ CONFIG_TESTS = \
+ fontconfig \
+ gccdepends \
+ libpng \
+ libjpeg \
+ libwebp \
+ libxml2 \
+ libxslt \
+ libzlib
+
+ for(test, CONFIG_TESTS): qtCompileTest($$test)
+}
+
+load(features)
Modified: trunk/Tools/qmake/configure.pro (121957 => 121958)
--- trunk/Tools/qmake/configure.pro 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Tools/qmake/configure.pro 2012-07-06 13:10:45 UTC (rev 121958)
@@ -7,7 +7,7 @@
# Will compute features based on command line arguments, config tests,
# dependency availability, and defaults.
-load(features)
+include(configure.pri)
# Compute delta
CONFIG -= $$BASE_CONFIG
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (121957 => 121958)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-06 13:10:45 UTC (rev 121958)
@@ -44,10 +44,7 @@
load(default_pre)
QTDIR=$$old_qtdir
-# Load results of config tests (only supported in Qt 5)
-haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
-
-unix:contains(config_test_gccdepends, yes) {
+unix:config_gccdepends {
# We have a compiler that supports the -MD option (and neither
# teambuilder nor icecream is messing up the .d file output).
CONFIG += GNUmake gcc_MD_depends
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121957 => 121958)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-06 13:10:45 UTC (rev 121958)
@@ -47,7 +47,7 @@
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
haveQt(5) {
- contains(config_test_fontconfig, yes):!mac {
+ config_fontconfig:!mac {
DEFINES += HAVE_FONTCONFIG=1
}
} else {
@@ -59,17 +59,17 @@
# We need libxml2 config test to determine to use libxml2 or not
!contains(DEFINES, WTF_USE_LIBXML2=.) {
- haveQt(5):contains(config_test_libxml2, yes): DEFINES += WTF_USE_LIBXML2=1
+ config_libxml2: DEFINES += WTF_USE_LIBXML2=1
}
# We need libxslt config test to determine to use libxslt or not
!contains(DEFINES, ENABLE_XSLT=.) {
- haveQt(5):contains(config_test_libxslt, yes): DEFINES += ENABLE_XSLT=1
+ config_libxslt: DEFINES += ENABLE_XSLT=1
}
# We need libzlib config test to determine to use enable websocket extension or not
!contains(DEFINES, WTF_USE_ZLIB=.) {
- haveQt(5):contains(config_test_libzlib, yes): DEFINES += WTF_USE_ZLIB=1
+ config_libzlib: DEFINES += WTF_USE_ZLIB=1
}
# Tiled Backing Store support
Deleted: trunk/Tools/qmake/sync.profile (121957 => 121958)
--- trunk/Tools/qmake/sync.profile 2012-07-06 13:08:41 UTC (rev 121957)
+++ trunk/Tools/qmake/sync.profile 2012-07-06 13:10:45 UTC (rev 121958)
@@ -1,11 +0,0 @@
-# This file is only used for config tests
-%configtests = (
- fontconfig => {},
- gccdepends => {},
- libpng => {},
- libjpeg => {},
- libwebp => {},
- libxml2 => {},
- libxslt => {},
- libzlib => {},
-);
