[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ossy at webkit.org
ossy at webkit.org
Sun Feb 20 23:16:00 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit bf546e66d9cc50d5c5c646482f87385e5268c99b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 19 14:31:20 2011 +0000
[Qt] Remove unnecessary "../Source" from paths
after moving source files into Source is finished.
Reviewed by Laszlo Gombos and Tor Arne Vestbø.
Source/JavaScriptCore:
* JavaScriptCore.pri:
Source/WebCore:
* WebCore.pri:
* WebCore.pro:
Source/WebKit/qt:
* Api/DerivedSources.pro:
Source/WebKit2:
* DerivedSources.pro:
* WebKit2.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76122 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 2a121e9..a8c401f 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-19 Csaba Osztrogonác <ossy at webkit.org>
+
+ Reviewed by Laszlo Gombos and Tor Arne Vestbø.
+
+ [Qt] Remove unnecessary "../Source" from paths
+ after moving source files into Source is finished.
+
+ * JavaScriptCore.pri:
+
2011-01-19 Benjamin Kalman <kalman at chromium.org>
Reviewed by Darin Adler.
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index 222f664..a6ddef3 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/Source/JavaScriptCore/JavaScriptCore.pri
@@ -23,7 +23,6 @@ CONFIG(standalone_package): DEFINES *= NDEBUG
JAVASCRIPTCORE_INCLUDEPATH = \
$$PWD \
$$PWD/.. \
- $$PWD/../.. \ # FIXME: Remove this include once we finish moving the source to Source
$$PWD/assembler \
$$PWD/bytecode \
$$PWD/bytecompiler \
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 078ec99..7748f83 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-19 Csaba Osztrogonác <ossy at webkit.org>
+
+ Reviewed by Laszlo Gombos and Tor Arne Vestbø.
+
+ [Qt] Remove unnecessary "../Source" from paths
+ after moving source files into Source is finished.
+
+ * WebCore.pri:
+ * WebCore.pro:
+
2011-01-19 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index 736d534..2f3a1fb 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -747,10 +747,10 @@ addExtraCompiler(xpathbison)
# GENERATOR 11: WebKit Version
# The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in Source/WebKit/mac/Configurations/.
-webkitversion.wkScript = $$PWD/../../Source/WebKit/scripts/generate-webkitversion.pl
+webkitversion.wkScript = $$PWD/../WebKit/scripts/generate-webkitversion.pl
webkitversion.output = $${WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
webkitversion.input = webkitversion.wkScript
-webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../../Source/WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/
+webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/
webkitversion.clean = ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
webkitversion.wkAddOutputToSources = false
addExtraCompiler(webkitversion)
diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index a857242..be1718e 100644
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -52,12 +52,12 @@ symbian: {
" "
webkitlibs.pkg_prerules = vendorinfo
- webkitbackup.sources = ../../Source/WebKit/qt/symbian/backup_registration.xml
+ webkitbackup.sources = ../WebKit/qt/symbian/backup_registration.xml
webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
contains(QT_CONFIG, declarative) {
declarativeImport.sources = $$QT_BUILD_TREE/imports/QtWebKit/qmlwebkitplugin$${QT_LIBINFIX}.dll
- declarativeImport.sources += ../../Source/WebKit/qt/declarative/qmldir
+ declarativeImport.sources += ../WebKit/qt/declarative/qmldir
declarativeImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit
DEPLOYMENT += declarativeImport
}
@@ -90,7 +90,7 @@ CONFIG(standalone_package) {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
- PRECOMPILED_HEADER = $$PWD/../../Source/WebKit/qt/WebKit_pch.h
+ PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
} else {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
@@ -110,7 +110,7 @@ CONFIG(QTDIR_build) {
!static: DEFINES += QT_MAKEDLL
symbian: TARGET =$$TARGET$${QT_LIBINFIX}
}
-moduleFile=$$PWD/../../Source/WebKit/qt/qt_webkit_version.pri
+moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri
isEmpty(QT_BUILD_TREE):include($$moduleFile)
VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
@@ -181,8 +181,8 @@ include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
!v8: addJavaScriptCoreLib(../JavaScriptCore)
webkit2 {
- include($$PWD/../../Source/WebKit2/WebKit2.pri)
- addWebKit2LibWholeArchive(../../Source/WebKit2)
+ include($$PWD/../WebKit2/WebKit2.pri)
+ addWebKit2LibWholeArchive(../WebKit2)
}
# Extract sources to build from the generator definitions
@@ -285,8 +285,8 @@ WEBCORE_INCLUDEPATH = \
$$PWD/platform/graphics/qt \
$$PWD/platform/network/qt \
$$PWD/platform/qt \
- $$PWD/../../Source/WebKit/qt/Api \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport \
+ $$PWD/../WebKit/qt/Api \
+ $$PWD/../WebKit/qt/WebCoreSupport \
$$WEBCORE_INCLUDEPATH
symbian {
@@ -2658,18 +2658,18 @@ HEADERS += \
xml/XSLTExtensions.h \
xml/XSLTProcessor.h \
xml/XSLTUnicodeSort.h \
- $$PWD/../../Source/WebKit/qt/Api/qwebplugindatabase_p.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/InspectorServerQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/PageClientQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/SearchPopupMenuQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h \
+ $$PWD/../WebKit/qt/Api/qwebplugindatabase_p.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/InspectorServerQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/PageClientQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/QtPlatformPlugin.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/PopupMenuQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.h \
+ $$PWD/../WebKit/qt/WebCoreSupport/WebPlatformStrategies.h \
$$PWD/platform/network/qt/DnsPrefetchHelper.h
v8 {
@@ -2757,39 +2757,39 @@ SOURCES += \
platform/text/qt/TextCodecQt.cpp \
platform/qt/WheelEventQt.cpp \
platform/qt/WidgetQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/DragClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/EditCommandQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/SearchPopupMenuQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp \
- ../../Source/WebKit/qt/Api/qwebframe.cpp \
- ../../Source/WebKit/qt/Api/qgraphicswebview.cpp \
- ../../Source/WebKit/qt/Api/qwebpage.cpp \
- ../../Source/WebKit/qt/Api/qwebview.cpp \
- ../../Source/WebKit/qt/Api/qwebelement.cpp \
- ../../Source/WebKit/qt/Api/qwebhistory.cpp \
- ../../Source/WebKit/qt/Api/qwebsettings.cpp \
- ../../Source/WebKit/qt/Api/qwebhistoryinterface.cpp \
- ../../Source/WebKit/qt/Api/qwebplugindatabase.cpp \
- ../../Source/WebKit/qt/Api/qwebpluginfactory.cpp \
- ../../Source/WebKit/qt/Api/qwebsecurityorigin.cpp \
- ../../Source/WebKit/qt/Api/qwebscriptworld.cpp \
- ../../Source/WebKit/qt/Api/qwebdatabase.cpp \
- ../../Source/WebKit/qt/Api/qwebinspector.cpp \
- ../../Source/WebKit/qt/Api/qwebkitversion.cpp
+ ../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
+ ../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/DragClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp \
+ ../WebKit/qt/WebCoreSupport/EditorClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/EditCommandQt.cpp \
+ ../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp \
+ ../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/InspectorServerQt.cpp \
+ ../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/PageClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/PopupMenuQt.cpp \
+ ../WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp \
+ ../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.cpp \
+ ../WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp \
+ ../WebKit/qt/Api/qwebframe.cpp \
+ ../WebKit/qt/Api/qgraphicswebview.cpp \
+ ../WebKit/qt/Api/qwebpage.cpp \
+ ../WebKit/qt/Api/qwebview.cpp \
+ ../WebKit/qt/Api/qwebelement.cpp \
+ ../WebKit/qt/Api/qwebhistory.cpp \
+ ../WebKit/qt/Api/qwebsettings.cpp \
+ ../WebKit/qt/Api/qwebhistoryinterface.cpp \
+ ../WebKit/qt/Api/qwebplugindatabase.cpp \
+ ../WebKit/qt/Api/qwebpluginfactory.cpp \
+ ../WebKit/qt/Api/qwebsecurityorigin.cpp \
+ ../WebKit/qt/Api/qwebscriptworld.cpp \
+ ../WebKit/qt/Api/qwebdatabase.cpp \
+ ../WebKit/qt/Api/qwebinspector.cpp \
+ ../WebKit/qt/Api/qwebkitversion.cpp
contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
HEADERS += platform/qt/QtMobileWebStyle.h
@@ -2797,8 +2797,8 @@ contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
}
maemo5 {
- HEADERS += ../../Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
- SOURCES += ../../Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
+ HEADERS += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
+ SOURCES += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
}
contains(DEFINES, ENABLE_SMOOTH_SCROLLING=1) {
@@ -3262,11 +3262,11 @@ contains(DEFINES, ENABLE_VIDEO=1) {
} else:contains(MOBILITY_CONFIG, multimedia) {
HEADERS += \
platform/graphics/qt/MediaPlayerPrivateQt.h \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
+ $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
SOURCES += \
platform/graphics/qt/MediaPlayerPrivateQt.cpp \
- $$PWD/../../Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
+ $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
CONFIG *= mobility
MOBILITY += multimedia
@@ -3452,18 +3452,18 @@ contains(DEFINES, ENABLE_GEOLOCATION=1) {
contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
HEADERS += \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionClientQt.h \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.h \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.h \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.h \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h
+ ../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.h \
+ ../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.h \
+ ../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.h \
+ ../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.h \
+ ../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h
SOURCES += \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.cpp \
- ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp
+ ../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp \
+ ../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.cpp \
+ ../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.cpp \
+ ../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp
CONFIG += mobility
MOBILITY += sensors
@@ -3868,7 +3868,7 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
QMAKE_EXTRA_TARGETS += install
}
-include($$PWD/../../Source/WebKit/qt/Api/headers.pri)
+include($$PWD/../WebKit/qt/Api/headers.pri)
HEADERS += $$WEBKIT_API_HEADERS
@@ -3996,9 +3996,9 @@ contains(CONFIG, texmap) {
symbian {
shared {
contains(CONFIG, def_files) {
- DEF_FILE=../../Source/WebKit/qt/symbian
+ DEF_FILE=../WebKit/qt/symbian
# defFilePath is for Qt4.6 compatibility
- defFilePath=../../Source/WebKit/qt/symbian
+ defFilePath=../WebKit/qt/symbian
} else {
MMP_RULES += EXPORTUNFROZEN
}
diff --git a/Source/WebKit/qt/Api/DerivedSources.pro b/Source/WebKit/qt/Api/DerivedSources.pro
index 3109ffe..8084242 100644
--- a/Source/WebKit/qt/Api/DerivedSources.pro
+++ b/Source/WebKit/qt/Api/DerivedSources.pro
@@ -45,7 +45,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
# the package sources are relocatable.
PATH_TO_HEADER = $$HEADER
- CONFIG(standalone_package): PATH_TO_HEADER = ../../../Source/WebKit/qt/Api/$$basename(HEADER)
+ CONFIG(standalone_package): PATH_TO_HEADER = ../../WebKit/qt/Api/$$basename(HEADER)
eval($${HEADER_TARGET}.target = $${DESTDIR}/$${HEADER_NAME})
eval($${HEADER_TARGET}.depends = $$HEADER)
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index f760119..1d35a9e 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-19 Csaba Osztrogonác <ossy at webkit.org>
+
+ Reviewed by Laszlo Gombos and Tor Arne Vestbø.
+
+ [Qt] Remove unnecessary "../Source" from paths
+ after moving source files into Source is finished.
+
+ * Api/DerivedSources.pro:
+
2011-01-18 Robert Hogan <robert at webkit.org>
Reviewed by Simon Hausmann.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 72d950e..dca4f08 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-19 Csaba Osztrogonác <ossy at webkit.org>
+
+ Reviewed by Laszlo Gombos and Tor Arne Vestbø.
+
+ [Qt] Remove unnecessary "../Source" from paths
+ after moving source files into Source is finished.
+
+ * DerivedSources.pro:
+ * WebKit2.pro:
+
2011-01-18 Maciej Stachowiak <mjs at apple.com>
Reviewed by Sam Weinig.
diff --git a/Source/WebKit2/DerivedSources.pro b/Source/WebKit2/DerivedSources.pro
index 4f6c7d9..4164203 100644
--- a/Source/WebKit2/DerivedSources.pro
+++ b/Source/WebKit2/DerivedSources.pro
@@ -5,10 +5,10 @@ CONFIG -= debug_and_release
CONFIG(standalone_package) {
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
- isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../Source/WebCore/generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
} else {
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
- isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../Source/WebCore/generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
}
WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
diff --git a/Source/WebKit2/WebKit2.pro b/Source/WebKit2/WebKit2.pro
index f4e007b..c478636 100644
--- a/Source/WebKit2/WebKit2.pro
+++ b/Source/WebKit2/WebKit2.pro
@@ -7,15 +7,15 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
CONFIG(standalone_package) {
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
- isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../Source/WebCore/generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
} else {
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
- isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../Source/WebCore/generated
+ isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
}
include($$PWD/../../WebKit.pri)
include($$PWD/../../common.pri)
-include($$PWD/../../Source/WebCore/features.pri)
+include($$PWD/../WebCore/features.pri)
include(WebKit2.pri)
TEMPLATE = lib
@@ -34,89 +34,88 @@ DESTDIR = $$WEBKIT2_DESTDIR
mac: CONFIG += build_all
WEBKIT2_INCLUDEPATH = \
- $$PWD/../.. \ # FIXME: Remove this include once we move all the source to Source.
- $$PWD/../../Source \
+ $$PWD/.. \
WEBKIT2_INCLUDEPATH = \
- $$PWD/../../Source/JavaScriptCore \
- $$PWD/../../Source/JavaScriptCore/assembler \
- $$PWD/../../Source/JavaScriptCore/bytecode \
- $$PWD/../../Source/JavaScriptCore/bytecompiler \
- $$PWD/../../Source/JavaScriptCore/debugger \
- $$PWD/../../Source/JavaScriptCore/interpreter \
- $$PWD/../../Source/JavaScriptCore/jit \
- $$PWD/../../Source/JavaScriptCore/parser \
- $$PWD/../../Source/JavaScriptCore/pcre \
- $$PWD/../../Source/JavaScriptCore/profiler \
- $$PWD/../../Source/JavaScriptCore/runtime \
- $$PWD/../../Source/JavaScriptCore/wtf \
- $$PWD/../../Source/JavaScriptCore/wtf/symbian \
- $$PWD/../../Source/JavaScriptCore/wtf/unicode \
- $$PWD/../../Source/JavaScriptCore/yarr \
- $$PWD/../../Source/JavaScriptCore/API \
- $$PWD/../../Source/JavaScriptCore/ForwardingHeaders \
+ $$PWD/../JavaScriptCore \
+ $$PWD/../JavaScriptCore/assembler \
+ $$PWD/../JavaScriptCore/bytecode \
+ $$PWD/../JavaScriptCore/bytecompiler \
+ $$PWD/../JavaScriptCore/debugger \
+ $$PWD/../JavaScriptCore/interpreter \
+ $$PWD/../JavaScriptCore/jit \
+ $$PWD/../JavaScriptCore/parser \
+ $$PWD/../JavaScriptCore/pcre \
+ $$PWD/../JavaScriptCore/profiler \
+ $$PWD/../JavaScriptCore/runtime \
+ $$PWD/../JavaScriptCore/wtf \
+ $$PWD/../JavaScriptCore/wtf/symbian \
+ $$PWD/../JavaScriptCore/wtf/unicode \
+ $$PWD/../JavaScriptCore/yarr \
+ $$PWD/../JavaScriptCore/API \
+ $$PWD/../JavaScriptCore/ForwardingHeaders \
$$WEBKIT2_INCLUDEPATH
WEBKIT2_INCLUDEPATH = \
- $$PWD/../../Source/WebCore \
- $$PWD/../../Source/WebCore/accessibility \
- $$PWD/../../Source/WebCore/bindings \
- $$PWD/../../Source/WebCore/bindings/generic \
- $$PWD/../../Source/WebCore/bindings/js \
- $$PWD/../../Source/WebCore/bridge \
- $$PWD/../../Source/WebCore/bridge/c \
- $$PWD/../../Source/WebCore/bridge/jsc \
- $$PWD/../../Source/WebCore/css \
- $$PWD/../../Source/WebCore/dom \
- $$PWD/../../Source/WebCore/dom/default \
- $$PWD/../../Source/WebCore/editing \
- $$PWD/../../Source/WebCore/history \
- $$PWD/../../Source/WebCore/html \
- $$PWD/../../Source/WebCore/html/canvas \
- $$PWD/../../Source/WebCore/inspector \
- $$PWD/../../Source/WebCore/loader \
- $$PWD/../../Source/WebCore/loader/appcache \
- $$PWD/../../Source/WebCore/loader/archive \
- $$PWD/../../Source/WebCore/loader/cache \
- $$PWD/../../Source/WebCore/loader/icon \
- $$PWD/../../Source/WebCore/mathml \
- $$PWD/../../Source/WebCore/notifications \
- $$PWD/../../Source/WebCore/page \
- $$PWD/../../Source/WebCore/page/animation \
- $$PWD/../../Source/WebCore/platform \
- $$PWD/../../Source/WebCore/platform/animation \
- $$PWD/../../Source/WebCore/platform/graphics \
- $$PWD/../../Source/WebCore/platform/graphics/filters \
- $$PWD/../../Source/WebCore/platform/graphics/transforms \
- $$PWD/../../Source/WebCore/platform/image-decoders \
- $$PWD/../../Source/WebCore/platform/mock \
- $$PWD/../../Source/WebCore/platform/network \
- $$PWD/../../Source/WebCore/platform/sql \
- $$PWD/../../Source/WebCore/platform/text \
- $$PWD/../../Source/WebCore/platform/text/transcoder \
- $$PWD/../../Source/WebCore/plugins \
- $$PWD/../../Source/WebCore/rendering \
- $$PWD/../../Source/WebCore/rendering/style \
- $$PWD/../../Source/WebCore/storage \
- $$PWD/../../Source/WebCore/svg \
- $$PWD/../../Source/WebCore/svg/animation \
- $$PWD/../../Source/WebCore/svg/graphics \
- $$PWD/../../Source/WebCore/svg/graphics/filters \
- $$PWD/../../Source/WebCore/svg/properties \
- $$PWD/../../Source/WebCore/websockets \
- $$PWD/../../Source/WebCore/wml \
- $$PWD/../../Source/WebCore/workers \
- $$PWD/../../Source/WebCore/xml \
+ $$PWD/../WebCore \
+ $$PWD/../WebCore/accessibility \
+ $$PWD/../WebCore/bindings \
+ $$PWD/../WebCore/bindings/generic \
+ $$PWD/../WebCore/bindings/js \
+ $$PWD/../WebCore/bridge \
+ $$PWD/../WebCore/bridge/c \
+ $$PWD/../WebCore/bridge/jsc \
+ $$PWD/../WebCore/css \
+ $$PWD/../WebCore/dom \
+ $$PWD/../WebCore/dom/default \
+ $$PWD/../WebCore/editing \
+ $$PWD/../WebCore/history \
+ $$PWD/../WebCore/html \
+ $$PWD/../WebCore/html/canvas \
+ $$PWD/../WebCore/inspector \
+ $$PWD/../WebCore/loader \
+ $$PWD/../WebCore/loader/appcache \
+ $$PWD/../WebCore/loader/archive \
+ $$PWD/../WebCore/loader/cache \
+ $$PWD/../WebCore/loader/icon \
+ $$PWD/../WebCore/mathml \
+ $$PWD/../WebCore/notifications \
+ $$PWD/../WebCore/page \
+ $$PWD/../WebCore/page/animation \
+ $$PWD/../WebCore/platform \
+ $$PWD/../WebCore/platform/animation \
+ $$PWD/../WebCore/platform/graphics \
+ $$PWD/../WebCore/platform/graphics/filters \
+ $$PWD/../WebCore/platform/graphics/transforms \
+ $$PWD/../WebCore/platform/image-decoders \
+ $$PWD/../WebCore/platform/mock \
+ $$PWD/../WebCore/platform/network \
+ $$PWD/../WebCore/platform/sql \
+ $$PWD/../WebCore/platform/text \
+ $$PWD/../WebCore/platform/text/transcoder \
+ $$PWD/../WebCore/plugins \
+ $$PWD/../WebCore/rendering \
+ $$PWD/../WebCore/rendering/style \
+ $$PWD/../WebCore/storage \
+ $$PWD/../WebCore/svg \
+ $$PWD/../WebCore/svg/animation \
+ $$PWD/../WebCore/svg/graphics \
+ $$PWD/../WebCore/svg/graphics/filters \
+ $$PWD/../WebCore/svg/properties \
+ $$PWD/../WebCore/websockets \
+ $$PWD/../WebCore/wml \
+ $$PWD/../WebCore/workers \
+ $$PWD/../WebCore/xml \
$$WEBKIT2_INCLUDEPATH
WEBKIT2_INCLUDEPATH = \
- $$PWD/../../Source/WebCore/bridge/qt \
- $$PWD/../../Source/WebCore/page/qt \
- $$PWD/../../Source/WebCore/platform/graphics/qt \
- $$PWD/../../Source/WebCore/platform/network/qt \
- $$PWD/../../Source/WebCore/platform/qt \
- $$PWD/../../WebKit/qt/Api \
- $$PWD/../../WebKit/qt/WebCoreSupport \
+ $$PWD/../WebCore/bridge/qt \
+ $$PWD/../WebCore/page/qt \
+ $$PWD/../WebCore/platform/graphics/qt \
+ $$PWD/../WebCore/platform/network/qt \
+ $$PWD/../WebCore/platform/qt \
+ $$PWD/../WebKit/qt/Api \
+ $$PWD/../WebKit/qt/WebCoreSupport \
$$WEBKIT2_INCLUDEPATH
WEBKIT2_INCLUDEPATH = \
@@ -171,7 +170,7 @@ symbian {
INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$INCLUDEPATH
}
-PREFIX_HEADER = $$PWD/../../Source/WebKit2/WebKit2Prefix.h
+PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
WEBKIT2_GENERATED_HEADERS = \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list