Diff
Modified: trunk/ChangeLog (121774 => 121775)
--- trunk/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/ChangeLog 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,3 +1,17 @@
+2012-07-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121766.
+ http://trac.webkit.org/changeset/121766
+ https://bugs.webkit.org/show_bug.cgi?id=90465
+
+ It caused flakey build errors on the bots (Requested by Ossy
+ on #webkit).
+
+ * Source/QtWebKit.pro:
+ * Source/api.pri:
+ * Source/tests.pri:
+ * WebKit.pro:
+
2012-07-03 George Staikos <[email protected]>
[BlackBerry] Enable Custom Scheme Handlers for BlackBerry.
Modified: trunk/Source/QtWebKit.pro (121774 => 121775)
--- trunk/Source/QtWebKit.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/QtWebKit.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -4,6 +4,8 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
+load(features)
+
TEMPLATE = subdirs
CONFIG += ordered
Modified: trunk/Source/WTF/ChangeLog (121774 => 121775)
--- trunk/Source/WTF/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WTF/ChangeLog 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,3 +1,14 @@
+2012-07-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121766.
+ http://trac.webkit.org/changeset/121766
+ https://bugs.webkit.org/show_bug.cgi?id=90465
+
+ It caused flakey build errors on the bots (Requested by Ossy
+ on #webkit).
+
+ * WTF.pri:
+
2012-07-03 Tor Arne Vestbø <[email protected]>
[Qt] Make use of .qmake.cache for caching features
Modified: trunk/Source/WTF/WTF.pri (121774 => 121775)
--- trunk/Source/WTF/WTF.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WTF/WTF.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -5,6 +5,8 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
+load(features)
+
# All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>).
INCLUDEPATH += $$PWD
Modified: trunk/Source/WebCore/ChangeLog (121774 => 121775)
--- trunk/Source/WebCore/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebCore/ChangeLog 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,3 +1,15 @@
+2012-07-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121766.
+ http://trac.webkit.org/changeset/121766
+ https://bugs.webkit.org/show_bug.cgi?id=90465
+
+ It caused flakey build errors on the bots (Requested by Ossy
+ on #webkit).
+
+ * DerivedSources.pri:
+ * WebCore.pri:
+
2012-07-03 George Staikos <[email protected]>
[BlackBerry] Enable Custom Scheme Handlers for BlackBerry.
Modified: trunk/Source/WebCore/DerivedSources.pri (121774 => 121775)
--- trunk/Source/WebCore/DerivedSources.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -11,6 +11,8 @@
sanitizedFile = $$toSanitizedPath($$_FILE_)
equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived
+load(features)
+
mac {
# FIXME: This runs the perl script every time. Is there a way we can run it only when deps change?
fwheader_generator.commands = perl $${ROOT_WEBKIT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${ROOT_WEBKIT_DIR}/Source/WebCore $${ROOT_BUILD_DIR}/Source/include mac
Modified: trunk/Source/WebCore/WebCore.pri (121774 => 121775)
--- trunk/Source/WebCore/WebCore.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebCore/WebCore.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -5,6 +5,8 @@
# 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.
Modified: trunk/Source/WebKit/qt/ChangeLog (121774 => 121775)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,3 +1,16 @@
+2012-07-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121766.
+ http://trac.webkit.org/changeset/121766
+ https://bugs.webkit.org/show_bug.cgi?id=90465
+
+ It caused flakey build errors on the bots (Requested by Ossy
+ on #webkit).
+
+ * declarative/declarative.pro:
+ * declarative/public.pri:
+ * tests/qgraphicswebview/qgraphicswebview.pro:
+
2012-07-03 Tor Arne Vestbø <[email protected]>
[Qt] Make use of .qmake.cache for caching features
Modified: trunk/Source/WebKit/qt/declarative/declarative.pro (121774 => 121775)
--- trunk/Source/WebKit/qt/declarative/declarative.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebKit/qt/declarative/declarative.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -7,6 +7,8 @@
TEMPLATE = subdirs
CONFIG += ordered
+load(features)
+
public_api.file = public.pri
public_api.makefile = Makefile.declarative.public
SUBDIRS += public_api
Modified: trunk/Source/WebKit/qt/declarative/public.pri (121774 => 121775)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -11,6 +11,8 @@
CONFIG += qt plugin
+load(features)
+
QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
copy2build.input = QMLDIRFILE
copy2build.output = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}/qmldir
Modified: trunk/Source/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro (121774 => 121775)
--- trunk/Source/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,6 +1,7 @@
include(../tests.pri)
exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+load(features)
contains(DEFINES, ENABLE_WEBGL=1) {
QT += opengl
}
Modified: trunk/Source/WebKit2/ChangeLog (121774 => 121775)
--- trunk/Source/WebKit2/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,3 +1,15 @@
+2012-07-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121766.
+ http://trac.webkit.org/changeset/121766
+ https://bugs.webkit.org/show_bug.cgi?id=90465
+
+ It caused flakey build errors on the bots (Requested by Ossy
+ on #webkit).
+
+ * DerivedSources.pri:
+ * Target.pri:
+
2012-07-03 Carlos Garcia Campos <[email protected]>
[GTK] Add WebKitWebView::context-menu-dismissed signal to WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/DerivedSources.pri (121774 => 121775)
--- trunk/Source/WebKit2/DerivedSources.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebKit2/DerivedSources.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -11,6 +11,8 @@
sanitizedFile = $$toSanitizedPath($$_FILE_)
equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived
+load(features)
+
WEBCORE_GENERATED_SOURCES_DIR = ../WebCore/$${GENERATED_SOURCES_DESTDIR}
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source
Modified: trunk/Source/WebKit2/Target.pri (121774 => 121775)
--- trunk/Source/WebKit2/Target.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/WebKit2/Target.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -7,6 +7,8 @@
TEMPLATE = lib
TARGET = WebKit2
+load(features)
+
include(WebKit2.pri)
WEBKIT += wtf _javascript_core webcore
Modified: trunk/Source/api.pri (121774 => 121775)
--- trunk/Source/api.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/api.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -124,6 +124,8 @@
runSyncQt() # Generate forwarding headers for the QtWebKit API
+load(features)
+
WEBKIT += wtf
!v8:WEBKIT += _javascript_core
Modified: trunk/Source/tests.pri (121774 => 121775)
--- trunk/Source/tests.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Source/tests.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -7,6 +7,8 @@
TEMPLATE = subdirs
CONFIG += ordered
+load(features)
+
WEBKIT_TESTS_DIR = $$PWD/WebKit/qt/tests
SUBDIRS += \
Modified: trunk/Tools/ChangeLog (121774 => 121775)
--- trunk/Tools/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/ChangeLog 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,3 +1,27 @@
+2012-07-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121766.
+ http://trac.webkit.org/changeset/121766
+ https://bugs.webkit.org/show_bug.cgi?id=90465
+
+ It caused flakey build errors on the bots (Requested by Ossy
+ on #webkit).
+
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * QtTestBrowser/QtTestBrowser.pro:
+ * Scripts/webkitdirs.pm:
+ (qtFeatureDefaults):
+ (buildQMakeProjects):
+ * Tools.pro:
+ * WebKitTestRunner/InjectedBundle/DerivedSources.pri:
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * WebKitTestRunner/Target.pri:
+ * qmake/.qmake.conf: Removed.
+ * qmake/configure.pro:
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/default_pre.prf:
+ * qmake/mkspecs/features/features.prf:
+
2012-07-03 George Staikos <[email protected]>
[BlackBerry] Enable Custom Scheme Handlers for BlackBerry.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (121774 => 121775)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -9,6 +9,8 @@
TARGET = DumpRenderTree
DESTDIR = $$ROOT_BUILD_DIR/bin
+load(features)
+
WEBKIT += wtf webcore
!v8: WEBKIT += _javascript_core
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (121774 => 121775)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -11,6 +11,8 @@
$${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \
$${ROOT_WEBKIT_DIR}/Source/WTF
+load(features)
+
SOURCES += \
$${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \
locationedit.cpp \
Modified: trunk/Tools/Scripts/webkitdirs.pm (121774 => 121775)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-07-03 16:04:50 UTC (rev 121775)
@@ -824,40 +824,24 @@
my $file;
my @buildArgs;
- my $qconfigs;
if (@_) {
@buildArgs = (@buildArgs, @{$_[0]});
- $qconfigs = $_[1];
my $dir = File::Spec->catfile(productDir(), "Tools", "qmake");
File::Path::mkpath($dir);
chdir $dir or die "Failed to cd into " . $dir . "\n";
$file = File::Spec->catfile($qmakepath, "configure.pro");
} else {
# Do a quick check of the features without running the config tests
- # FIXME: When Qt supports it, go through configure.pro but without config tests
$file = File::Spec->catfile($qmakepath, "mkspecs", "features", "features.prf");
push @buildArgs, "CONFIG+=compute_defaults";
}
- my @defaults = `$qmakecommand @buildArgs $file 2>&1`;
+ my $defaults = `$qmakecommand @buildArgs $file 2>&1`;
my %qtFeatureDefaults;
- for (@defaults) {
- if (/ DEFINES: /) {
- while (/(\S+?)=(\S+?)/gi) {
- $qtFeatureDefaults{$1}=$2;
- }
- } elsif (/ CONFIG:(.*)$/) {
- if (@_) {
- $$qconfigs = $1;
- }
- } elsif (/Done computing defaults/) {
- print "\n";
- last;
- } elsif (@_) {
- print $_;
- }
+ while ($defaults =~ m/(\S+?)=(\S+?)/gi) {
+ $qtFeatureDefaults{$1}=$2;
}
chdir $originalCwd;
@@ -2246,7 +2230,6 @@
my ($projects, $clean, @buildParams) = @_;
my @buildArgs = ();
- my $qconfigs = "";
my $make = qtMakeCommand($qmakebin);
my $makeargs = "";
@@ -2303,7 +2286,7 @@
File::Path::mkpath($dir);
chdir $dir or die "Failed to cd into " . $dir . "\n";
- my %defines = qtFeatureDefaults(\@buildArgs, \$qconfigs);
+ my %defines = qtFeatureDefaults(\@buildArgs);
my $svnRevision = currentSVNRevision();
@@ -2312,8 +2295,6 @@
my $pathToDefinesCache = File::Spec->catfile($dir, ".webkit.config");
my $pathToOldDefinesFile = File::Spec->catfile($dir, "defaults.txt");
- # FIXME: Get rid of .webkit.config and defaults.txt and move all the logic to .qmake.cache
-
# Ease transition to new build layout
if (-e $pathToOldDefinesFile) {
print "Old build layout detected";
@@ -2376,24 +2357,13 @@
# 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);
+ qtFeatureDefaults(\@buildArgs);
#}
# Still trigger an incremental build
$buildHint = "incremental";
}
- if ($buildHint eq "incremental") {
- my $qmakeDefines = "DEFINES +=";
- foreach my $key (sort keys %defines) {
- $qmakeDefines .= " \\\n $key=$defines{$key}";
- }
- open(QMAKE_CACHE, ">.qmake.cache") or die "Cannot create .qmake.cache!\n";
- print QMAKE_CACHE "CONFIG += webkit_configured $qconfigs\n";
- print QMAKE_CACHE $qmakeDefines."\n";
- close(QMAKE_CACHE);
- }
-
# Save config up-front so we can detect changes to the build config even
# when the user re-configures after aborting the build.
open(DEFAULTS, ">$pathToDefinesCache");
Modified: trunk/Tools/Tools.pro (121774 => 121775)
--- trunk/Tools/Tools.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/Tools.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -7,6 +7,8 @@
TEMPLATE = subdirs
CONFIG += ordered
+load(features)
+
!no_webkit1 {
SUBDIRS += QtTestBrowser/QtTestBrowser.pro
SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri (121774 => 121775)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -11,6 +11,8 @@
sanitizedFile = $$toSanitizedPath($$_FILE_)
equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived
+load(features)
+
IDL_BINDINGS += \
Bindings/AccessibilityController.idl \
Bindings/AccessibilityTextMarker.idl \
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (121774 => 121775)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -52,6 +52,8 @@
QT += declarative widgets webkit
+load(features)
+
WEBKIT += wtf _javascript_core webcore
CONFIG += plugin rpath
Modified: trunk/Tools/WebKitTestRunner/Target.pri (121774 => 121775)
--- trunk/Tools/WebKitTestRunner/Target.pri 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/WebKitTestRunner/Target.pri 2012-07-03 16:04:50 UTC (rev 121775)
@@ -27,6 +27,8 @@
QT = core gui widgets network declarative testlib quick quick-private webkit
+load(features)
+
WEBKIT += wtf _javascript_core webkit2
DEFINES += USE_SYSTEM_MALLOC=1
Deleted: trunk/Tools/qmake/.qmake.conf (121774 => 121775)
--- trunk/Tools/qmake/.qmake.conf 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/qmake/.qmake.conf 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,2 +0,0 @@
-# This file is only here to isolate the configure project
-# from the rest of the tree.
Modified: trunk/Tools/qmake/configure.pro (121774 => 121775)
--- trunk/Tools/qmake/configure.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/qmake/configure.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -1,18 +1,3 @@
-# -------------------------------------------------------------------
-# 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
-# -------------------------------------------------------------------
-
-# Will compute features based on command line arguments, config tests,
-# dependency availability, and defaults.
load(features)
-
-# Compute delta
-CONFIG -= $$BASE_CONFIG
-DEFINES -= $$BASE_DEFINES
-
-message(CONFIG: $$CONFIG)
-message(DEFINES: $$DEFINES)
+message($$DEFINES)
error("Done computing defaults")
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (121774 => 121775)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-07-03 16:04:50 UTC (rev 121775)
@@ -5,6 +5,8 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
+load(features)
+
# Flag that we're now done processing the project file. This allows
# a feature to distinguish between being processed due to a load()
# or include() and a CONFIG += feature.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (121774 => 121775)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-03 16:04:50 UTC (rev 121775)
@@ -27,13 +27,10 @@
WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
-# Detect if we're running the initial configure step
-pro_file_name = $$basename(_PRO_FILE_)
-equals(pro_file_name, configure.pro): CONFIG += configure_pass
-
# We want the QtWebKit API forwarding includes to live in the root build dir,
# except when we are running the config.tests in Tools/qmake.
-!configure_pass: QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR
+pro_file_name = $$basename(_PRO_FILE_)
+!equals(pro_file_name, configure.pro): QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR
# Load Qt's defaults after we've resolved the build directory. This will also
# run syncqt if there is a sync.profile in the $$_PRO_FILE_PWD_. We never want
@@ -126,30 +123,3 @@
# Set some defaults for specific platforms
CONFIG += include_webinspector
-
-# Try to locate sqlite3 source (for WebCore)
-SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
-isEmpty(SQLITE3SRCDIR) {
- haveQt(5): SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
- else: SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
-}
-
-# --------- Make features available to JSC ------------
-
-## Forward enabled feature macros to _javascript_ enabled features macros
-FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1
-v8: FEATURE_DEFINES_JAVASCRIPT += V8_BINDING=1
-
-for(define, DEFINES) {
- enabled_feature_define = $$find(define, ^ENABLE_.+=1$)
- isEmpty(enabled_feature_define): next()
-
- FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define
-}
-
-configure_pass {
- # Save the base config and defines so we can compute the delta between
- # what features.prf introduced and what was already there.
- BASE_CONFIG = $$CONFIG
- BASE_DEFINES = $$DEFINES
-}
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121774 => 121775)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-03 16:04:50 UTC (rev 121775)
@@ -20,6 +20,13 @@
## load mobilityconfig if mobility is available
load(mobilityconfig, true)
+# Try to locate sqlite3 source
+SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
+isEmpty(SQLITE3SRCDIR) {
+ haveQt(5):SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
+ else:SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
+}
+
# ---------- Dynamically detect optional features -------------
#
# Please note, static feature defaults go in features.pri
@@ -213,13 +220,24 @@
contains(DEFINES, $$opposite): DEFINES -= $$define
}
+# --------- Make features available to JSC ------------
+
+## Forward enabled feature macros to _javascript_ enabled features macros
+FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1
+v8: FEATURE_DEFINES_JAVASCRIPT += V8_BINDING=1
+
+for(define, DEFINES) {
+ enabled_feature_define = $$find(define, ^ENABLE_.+=1$)
+ isEmpty(enabled_feature_define): next()
+
+ FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define
+}
+
# ---------------------- The end ----------------------
# Used to compute defaults for the build-webkit script
# Don't place anything after this!
CONFIG(compute_defaults) {
- # FIXME: We should have configure.pro do this when the config tests
- # can be selectivly run.
- message(DEFINES: $$DEFINES)
+ message($$DEFINES)
error("Done computing defaults")
}
Modified: trunk/WebKit.pro (121774 => 121775)
--- trunk/WebKit.pro 2012-07-03 16:00:22 UTC (rev 121774)
+++ trunk/WebKit.pro 2012-07-03 16:04:50 UTC (rev 121775)
@@ -8,6 +8,8 @@
TEMPLATE = subdirs
CONFIG += ordered
+load(features)
+
QMAKEPATH = $$(QMAKEPATH)
isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
