Reviewed by Csaba Osztrogonác.
[Qt] Move project files into Source
https://bugs.webkit.org/show_bug.cgi?id=52891
* Source/DerivedSources.pro: Copied from DerivedSources.pro.
* Source/WebKit.pri: Renamed from WebKit.pri.
* Source/WebKit.pro: Added.
* Source/common.pri: Renamed from common.pri.
* WebKit.pro: Removed.
2011-01-24 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Move project files into Source
https://bugs.webkit.org/show_bug.cgi?id=52891
* JavaScriptCore.pri:
* JavaScriptCore.pro:
* jsc.pro:
2011-01-24 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Move project files into Source
https://bugs.webkit.org/show_bug.cgi?id=52891
No new tests needed.
* WebCore.pri:
* WebCore.pro:
2011-01-24 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Move project files into Source
https://bugs.webkit.org/show_bug.cgi?id=52891
* declarative/declarative.pro:
* docs/docs.pri:
* tests/tests.pri:
2011-01-24 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Move project files into Source
https://bugs.webkit.org/show_bug.cgi?id=52891
* DerivedSources.pro:
* WebKit2.pro:
* WebProcess.pro:
2011-01-24 Andras Becsi <abecsi@webkit.org>
Reviewed by Csaba Osztrogonác.
[Qt] Move project files into Source
https://bugs.webkit.org/show_bug.cgi?id=52891
* DerivedSources.pro: Renamed from DerivedSources.pro.
* DumpRenderTree/qt/DumpRenderTree.pro:
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
* MiniBrowser/DerivedSources.pro:
* MiniBrowser/qt/MiniBrowser.pro:
* QtTestBrowser/QtTestBrowser.pro:
* Scripts/webkitdirs.pm:
* Tools.pro: Added.
* WebKitTestRunner/DerivedSources.pro:
* WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
* WebKitTestRunner/qt/WebKitTestRunner.pro:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76496
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2011-01-24 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Move project files into Source
+ https://bugs.webkit.org/show_bug.cgi?id=52891
+
+ * Source/DerivedSources.pro: Copied from DerivedSources.pro.
+ * Source/WebKit.pri: Renamed from WebKit.pri.
+ * Source/WebKit.pro: Added.
+ * Source/common.pri: Renamed from common.pri.
+ * WebKit.pro: Removed.
+
2011-01-20 Siddharth Mathur <siddharth.mathur@nokia.com>
Reviewed by Laszlo Gombos.
CONFIG += ordered
SUBDIRS += \
- Source/JavaScriptCore/DerivedSources.pro \
- Source/WebCore/DerivedSources.pro \
- Source/WebKit/qt/Api/DerivedSources.pro
+ JavaScriptCore/DerivedSources.pro \
+ WebCore/DerivedSources.pro \
+ WebKit/qt/Api/DerivedSources.pro
-webkit2 {
- SUBDIRS += Source/WebKit2/DerivedSources.pro \
- Tools/WebKitTestRunner/DerivedSources.pro \
- Tools/MiniBrowser/DerivedSources.pro
-}
+webkit2: SUBDIRS += WebKit2/DerivedSources.pro
for(subpro, SUBDIRS) {
subdir = $${dirname(subpro)}
+2011-01-24 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Move project files into Source
+ https://bugs.webkit.org/show_bug.cgi?id=52891
+
+ * JavaScriptCore.pri:
+ * JavaScriptCore.pro:
+ * jsc.pro:
+
2011-01-23 Mark Rowe <mrowe@apple.com>
Follow-up to r76477.
# JavaScriptCore - Qt4 build info
-include(../../common.pri)
+include(../common.pri)
VPATH += $$PWD
# JavaScriptCore - qmake build info
CONFIG += building-libs
-include($$PWD/../../WebKit.pri)
+include($$PWD/../WebKit.pri)
include(JavaScriptCore.pri)
TEMPLATE = lib
win32-msvc*: CONFIG += exceptions_off stl_off
isEmpty(OUTPUT_DIR): OUTPUT_DIR= ..
-include($$PWD/../../WebKit.pri)
+include($$PWD/../WebKit.pri)
unix:!mac:!symbian:CONFIG += link_pkgconfig
+2011-01-24 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Move project files into Source
+ https://bugs.webkit.org/show_bug.cgi?id=52891
+
+ No new tests needed.
+
+ * WebCore.pri:
+ * WebCore.pro:
+
2011-01-24 Kent Tamura <tkent@chromium.org>
Unreviewed, trivial fix.
-include(../../common.pri)
+include(../common.pri)
include(features.pri)
CONFIG(standalone_package) {
}
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
-include($$PWD/../../WebKit.pri)
+include($$PWD/../WebKit.pri)
TEMPLATE = lib
TARGET = QtWebKit
# either the generated files directory or as part of the Qt package through
# QTDIR_build
CONFIG(QTDIR_build): CONFIG += standalone_package
-else:exists($$PWD/Source/WebCore/generated): CONFIG += standalone_package
+else:exists($$PWD/WebCore/generated): CONFIG += standalone_package
CONFIG += depend_includepath
DEPENDPATH += $$OUT_PWD
DEFINES += BUILDING_QT__=1
building-libs {
- win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/Source/JavaScriptCore/os-win32
+ win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
} else {
CONFIG(QTDIR_build) {
QT += webkit
symbian {
TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB
# For EXEs only: set heap to usable value
- TARGET.EPOCHEAPSIZE =
+ TARGET.EPOCHEAPSIZE =
heapSizeRule = \
"$${LITERAL_HASH}ifdef WINSCW" \
"EPOCHEAPSIZE 0x40000 0x2000000 // Min 256kB, Max 32MB" \
}
}
}
- DEPENDPATH += $$PWD/Source/WebKit/qt/Api
+ DEPENDPATH += $$PWD/WebKit/qt/Api
}
!mac:!unix|symbian {
DEFINES += NDEBUG
}
-INCLUDEPATH += $$OUTPUT_DIR/Source/include/QtWebKit
+INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
CONFIG -= warn_on
*-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293
RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates
# Make debug symbols leaner in RVCT4.x. Ignored by compiler for release builds
- QMAKE_CXXFLAGS.ARMCC_4_0 += --remove_unneeded_entities
+ QMAKE_CXXFLAGS.ARMCC_4_0 += --remove_unneeded_entities
}
*-armcc {
--- /dev/null
+TEMPLATE = subdirs
+CONFIG += ordered
+
+include(WebKit.pri)
+
+!v8 {
+ exists($$PWD/JavaScriptCore/JavaScriptCore.pro): SUBDIRS += JavaScriptCore/JavaScriptCore.pro
+ exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
+}
+
+webkit2:exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
+
+SUBDIRS += WebCore
+
+webkit2:exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+
+contains(QT_CONFIG, declarative) {
+ exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
+}
+
+exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
+
+build-qtscript {
+ SUBDIRS += \
+ JavaScriptCore/qt/api/QtScript.pro \
+ JavaScriptCore/qt/tests \
+ JavaScriptCore/qt/benchmarks
+}
+
+symbian {
+ # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
+ install.commands = $(MAKE) -C WebCore install
+ QMAKE_EXTRA_TARGETS += install
+}
+
+include(WebKit/qt/docs/docs.pri)
+2011-01-24 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Move project files into Source
+ https://bugs.webkit.org/show_bug.cgi?id=52891
+
+ * declarative/declarative.pro:
+ * docs/docs.pri:
+ * tests/tests.pri:
+
2011-01-22 Ilya Tikhonovsky <loislo@chromium.org>
Reviewed by Pavel Feldman.
TARGET = $$TARGET$${QT_LIBINFIX}
}
-include(../../../../WebKit.pri)
+include(../../../WebKit.pri)
QT += declarative
-include(../../../../WebKit.pri)
+include(../../../WebKit.pri)
unix {
QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
$$PWD \
$$PWD/../Api
-include(../../../../WebKit.pri)
+include(../../../WebKit.pri)
QT += testlib network
QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+2011-01-24 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Move project files into Source
+ https://bugs.webkit.org/show_bug.cgi?id=52891
+
+ * DerivedSources.pro:
+ * WebKit2.pro:
+ * WebProcess.pro:
+
2011-01-23 Damian Kaleta <dkaleta@apple.com>
Reviewed by Kevin Decker.
PYTHON = python
}
-SRC_ROOT_DIR = $$replace(PWD, /Source/WebKit2, /)
+SRC_ROOT_DIR = $$replace(PWD, /Source/WebKit2, "")
defineTest(addExtraCompiler) {
eval($${1}.CONFIG = target_predeps no_link)
$$PWD/Scripts/webkit2/__init__.py \
$$PWD/Scripts/webkit2/messages.py
-message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}Source/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_header_generator.input = MESSAGE_RECEIVERS
message_header_generator.depends = $$SCRIPTS
message_header_generator.output_function = message_header_generator_output
addExtraCompiler(message_header_generator)
-message_receiver_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}Source/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+message_receiver_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
message_receiver_generator.input = MESSAGE_RECEIVERS
message_receiver_generator.depends = $$SCRIPTS
message_receiver_generator.output_function = message_receiver_generator_output
addExtraCompiler(message_receiver_generator)
-fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebKit2 ../../include qt
+fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebKit2 ../include qt
fwheader_generator.depends = $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl
generated_files.depends += fwheader_generator
QMAKE_EXTRA_TARGETS += fwheader_generator
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
}
-include($$PWD/../../WebKit.pri)
-include($$PWD/../../common.pri)
+include($$PWD/../WebKit.pri)
+include($$PWD/../common.pri)
include($$PWD/../WebCore/features.pri)
include(WebKit2.pri)
qt/MainQt.cpp
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
-include(../../WebKit.pri)
+include($$PWD/../WebKit.pri)
DESTDIR = $$OUTPUT_DIR/bin
!CONFIG(standalone_package): CONFIG -= app_bundle
+2011-01-24 Andras Becsi <abecsi@webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Move project files into Source
+ https://bugs.webkit.org/show_bug.cgi?id=52891
+
+ * DerivedSources.pro: Renamed from DerivedSources.pro.
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+ * MiniBrowser/DerivedSources.pro:
+ * MiniBrowser/qt/MiniBrowser.pro:
+ * QtTestBrowser/QtTestBrowser.pro:
+ * Scripts/webkitdirs.pm:
+ * Tools.pro: Added.
+ * WebKitTestRunner/DerivedSources.pro:
+ * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+ * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
2011-01-22 Geoffrey Garen <ggaren@apple.com>
Reviewed by Dan Bernstein.
--- /dev/null
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += \
+ MiniBrowser/DerivedSources.pro \
+ WebKitTestRunner/DerivedSources.pro
+
+for(subpro, SUBDIRS) {
+ subdir = $${dirname(subpro)}
+ subtarget = $$replace(subpro, [^a-zA-Z0-9_], -)
+ eval($${subtarget}.makefile = "Makefile.DerivedSources")
+ eval(generated_files-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f Makefile.DerivedSources generated_files))
+ QMAKE_EXTRA_TARGETS += generated_files-$${subtarget}
+ generated_files.depends += generated_files-$${subtarget}
+}
+QMAKE_EXTRA_TARGETS += generated_files
BASEDIR = $$PWD/../
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
-include(../../../WebKit.pri)
+include(../../../Source/WebKit.pri)
INCLUDEPATH += ../../../Source
INCLUDEPATH += ../../../Source/JavaScriptCore
INCLUDEPATH += ../../../Source/JavaScriptCore/ForwardingHeaders
INCLUDEPATH += $$BASEDIR
-DESTDIR = ../../../bin
+DESTDIR = ../../bin
unix:!mac:!symbian {
CONFIG += link_pkgconfig
VPATH = ../../unix/TestNetscapePlugin ../../TestNetscapePlugIn
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
-include(../../../../WebKit.pri)
+include(../../../../Source/WebKit.pri)
DESTDIR = $$OUTPUT_DIR/lib/plugins
QMAKE_EXTRA_TARGETS += generated_files
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
SRC_ROOT_DIR = $$replace(PWD, "/Tools/MiniBrowser", "")
-!exists($$OUTPUT_DIR/Tools/MiniBrowser/qt):system($$QMAKE_MKDIR $$OUTPUT_DIR/Tools/MiniBrowser/qt)
+!exists($$OUTPUT_DIR/MiniBrowser/qt): system($$QMAKE_MKDIR $$OUTPUT_DIR/MiniBrowser/qt)
ualist_copier.input = $$SRC_ROOT_DIR/Tools/QtTestBrowser/useragentlist.txt
-ualist_copier.output = $$OUTPUT_DIR/Tools/MiniBrowser/qt/useragentlist.txt
+ualist_copier.output = $$OUTPUT_DIR/MiniBrowser/qt/useragentlist.txt
ualist_copier.tempNames = $$ualist_copier.input $$ualist_copier.output
ualist_copier.commands = $$QMAKE_COPY $$replace(ualist_copier.tempNames, "/", $$QMAKE_DIR_SEP)
ualist_copier.depends = $$ualist_copier.input
# polluting the source tree.
qrc_copier.input = $$SRC_ROOT_DIR/Tools/MiniBrowser/MiniBrowser.qrc
-qrc_copier.output = $$OUTPUT_DIR/Tools/MiniBrowser/qt/MiniBrowser.qrc
+qrc_copier.output = $$OUTPUT_DIR/MiniBrowser/qt/MiniBrowser.qrc
qrc_copier.tempNames = $$qrc_copier.input $$qrc_copier.output
qrc_copier.commands = $$QMAKE_COPY $$replace(qrc_copier.tempNames, "/", $$QMAKE_DIR_SEP)
qrc_copier.depends = ualist_copier $$qrc_copier.input
CONFIG += uitools
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
-include(../../../WebKit.pri)
+include(../../../Source/WebKit.pri)
INCLUDEPATH += \
$$PWD/../../../Source/WebKit2/ \
# We copy the resource file to the build directory.
# The copier is defined in Tools/MiniBrowser/DerivedSources.pro.
RESOURCES += \
- $$OUTPUT_DIR/Tools/MiniBrowser/qt/MiniBrowser.qrc
+ $$OUTPUT_DIR/MiniBrowser/qt/MiniBrowser.qrc
CONFIG += uitools
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
-include(../../WebKit.pri)
+include(../../Source/WebKit.pri)
DESTDIR = $$OUTPUT_DIR/bin
!CONFIG(standalone_package): CONFIG -= app_bundle
sub jscProductDir
{
my $productDir = productDir();
- $productDir .= "/Source/JavaScriptCore" if isQt();
+ $productDir .= "JavaScriptCore" if isQt();
$productDir .= "/$configuration" if (isQt() && isWindows());
$productDir .= "/Programs" if (isGtk() || isEfl());
my @dsQmakeArgs = @buildArgs;
push @dsQmakeArgs, "-r";
- push @dsQmakeArgs, sourceDir() . "/DerivedSources.pro";
+ push @dsQmakeArgs, sourceDir() . "/Source/DerivedSources.pro";
push @dsQmakeArgs, "-o Makefile.DerivedSources";
print "Calling '$qmakebin @dsQmakeArgs' in " . $dir . "\n\n";
my $result = system "$qmakebin @dsQmakeArgs";
die "Failed while running $qmakebin to generate derived sources!\n";
}
- my $dsMakefile = "Makefile.DerivedSources";
-
- # Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60
- my @subdirs = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit/qt/Api");
+ # FIXME: Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60
+ # To avoid overwriting of Makefile.DerivedSources in the root dir use Makefile.DerivedSources.Tools for Tools
+ my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
- push @subdirs, "Source/WebKit2";
- push @subdirs, "Tools/WebKitTestRunner";
- push @subdirs, "Tools/MiniBrowser";
+ push @subdirs, "WebKit2";
+ if ( -e sourceDir() ."/Tools/DerivedSources.pro" ) {
+ @dsQmakeArgs = @buildArgs;
+ push @dsQmakeArgs, "-r";
+ push @dsQmakeArgs, sourceDir() . "/Tools/DerivedSources.pro";
+ push @dsQmakeArgs, "-o Makefile.DerivedSources.Tools";
+ print "Calling '$qmakebin @dsQmakeArgs' in " . $dir . "\n\n";
+ my $result = system "$qmakebin @dsQmakeArgs";
+ if ($result ne 0) {
+ die "Failed while running $qmakebin to generate derived sources for Tools!\n";
+ }
+ push @subdirs, "MiniBrowser";
+ push @subdirs, "WebKitTestRunner";
+ }
}
for my $subdir (@subdirs) {
- print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/$subdir\n\n";
+ my $dsMakefile = "Makefile.DerivedSources";
+ print "Calling '$make $makeargs -C $subdir -f $dsMakefile generated_files' in " . $dir . "/$subdir\n\n";
if ($make eq "nmake") {
my $subdirWindows = $subdir;
$subdirWindows =~ s:/:\\:g;
}
}
- push @buildArgs, sourceDir() . "/WebKit.pro";
-
+ push @buildArgs, sourceDir() . "/Source/WebKit.pro";
print "Calling '$qmakebin @buildArgs' in " . $dir . "\n\n";
print "Installation headers directory: $installHeaders\n" if(defined($installHeaders));
print "Installation libraries directory: $installLibs\n" if(defined($installLibs));
die "Failed to setup build environment using $qmakebin!\n";
}
+ $buildArgs[-1] = sourceDir() . "/Tools/Tools.pro";
+ print "Calling '$qmakebin @buildArgs -o Makefile.Tools' in " . $dir . "\n\n";
+
+ $result = system "$qmakebin @buildArgs -o Makefile.Tools";
+ if ($result ne 0) {
+ die "Failed to setup build environment using $qmakebin!\n";
+ }
+
# Manually create makefiles for the examples so we don't build by default
- my $examplesDir = $dir . "/Source/WebKit/qt/examples";
+ my $examplesDir = $dir . "/WebKit/qt/examples";
File::Path::mkpath($examplesDir);
$buildArgs[-1] = sourceDir() . "/Source/WebKit/qt/examples/examples.pro";
chdir $examplesDir or die;
die "Failed to create makefiles for the examples!\n" if $result ne 0;
chdir $dir or die;
+ my $makeTools = "echo No Makefile for Tools. Skipping make";
+
+ if (-e "$dir/Makefile.Tools") {
+ $makeTools = "$make $makeargs -f Makefile.Tools";
+ }
+
if ($clean) {
print "Calling '$make $makeargs distclean' in " . $dir . "\n\n";
$result = system "$make $makeargs distclean";
+ $result = $result || system "$makeTools distclean";
} elsif (isSymbian()) {
print "\n\nWebKit is now configured for building, but you have to make\n";
print "a choice about the target yourself. To start the build run:\n\n";
} else {
print "Calling '$make $makeargs' in " . $dir . "\n\n";
$result = system "$make $makeargs";
+ $result = $result || system "$makeTools";
}
chdir ".." or die;
--- /dev/null
+TEMPLATE = subdirs
+CONFIG += ordered
+
+exists($$PWD/QtTestBrowser/QtTestBrowser.pro): SUBDIRS += QtTestBrowser/QtTestBrowser.pro
+exists($$PWD/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
+exists($$PWD/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += DumpRenderTree/qt/ImageDiff.pro
+
+webkit2 {
+ exists($$PWD/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
+ exists($$PWD/WebKitTestRunner/WebKitTestRunner.pro): SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+}
+
+!win32:!symbian {
+ exists($$PWD/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro): SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+}
return(true)
}
-SRC_ROOT_DIR = $$replace(PWD, /Tools/WebKitTestRunner, /)
+SRC_ROOT_DIR = $$replace(PWD, /Tools/WebKitTestRunner, "")
# Make sure forwarded headers needed by this project are present
fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Tools/WebKitTestRunner $${OUTPUT_DIR}/include qt
OBJECTS_DIR = obj/release
}
-include(../../../../WebKit.pri)
+include(../../../../Source/WebKit.pri)
include(../../../../Source/JavaScriptCore/JavaScriptCore.pri)
-addJavaScriptCoreLib(../../../../Source/JavaScriptCore)
+addJavaScriptCoreLib(../../../JavaScriptCore)
include(../../../../Source/WebKit2/WebKit2.pri)
-addWebKit2Lib(../../../../Source/WebKit2)
+addWebKit2Lib(../../../WebKit2)
INCLUDEPATH += \
$$PWD \
GENERATED_SOURCES_DIR = ../generated
-include(../../../WebKit.pri)
+include(../../../Source/WebKit.pri)
!CONFIG(release, debug|release) {
OBJECTS_DIR = obj/debug
}
include(../../../Source/JavaScriptCore/JavaScriptCore.pri)
-addJavaScriptCoreLib(../../../Source/JavaScriptCore)
+addJavaScriptCoreLib(../../JavaScriptCore)
+++ /dev/null
-TEMPLATE = subdirs
-CONFIG += ordered
-
-include(WebKit.pri)
-
-!v8: SUBDIRS += Source/JavaScriptCore
-webkit2 {
- SUBDIRS += Source/WebKit2
-}
-SUBDIRS += Source/WebCore
-
-# If the source exists, built it
-exists($$PWD/Tools/QtTestBrowser): SUBDIRS += Tools/QtTestBrowser
-contains(QT_CONFIG, declarative) {
- exists($$PWD/Source/WebKit/qt/declarative): SUBDIRS += Source/WebKit/qt/declarative
-}
-!v8:exists($$PWD/Source/JavaScriptCore/jsc.pro): SUBDIRS += Source/JavaScriptCore/jsc.pro
-exists($$PWD/Source/WebKit/qt/tests): SUBDIRS += Source/WebKit/qt/tests
-exists($$PWD/Tools/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += Tools/DumpRenderTree/qt/DumpRenderTree.pro
-exists($$PWD/Tools/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += Tools/DumpRenderTree/qt/ImageDiff.pro
-
-!win32:!symbian {
- exists($$PWD/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro): SUBDIRS += Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
-}
-
-build-qtscript {
- SUBDIRS += \
- Source/JavaScriptCore/qt/api/QtScript.pro \
- Source/JavaScriptCore/qt/tests \
- Source/JavaScriptCore/qt/benchmarks
-}
-
-webkit2 {
- exists($$PWD/Source/WebKit2/WebProcess.pro): SUBDIRS += Source/WebKit2/WebProcess.pro
- exists($$PWD/Tools/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += Tools/MiniBrowser/qt/MiniBrowser.pro
- exists($$PWD/Tools/WebKitTestRunner/WebKitTestRunner.pro): SUBDIRS += Tools/WebKitTestRunner/WebKitTestRunner.pro
-}
-
-symbian {
- # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
- install.commands = $(MAKE) -C WebCore install
- QMAKE_EXTRA_TARGETS += install
-}
-
-include(Source/WebKit/qt/docs/docs.pri)
git://git.webkit.org / WebKit-https.git / commitdiff