Changeset 64460 in webkit
- Timestamp:
- Aug 2, 2010 7:32:38 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r64410 r64460 1 2010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Generate forwarding headers for WebKit2 6 7 https://bugs.webkit.org/show_bug.cgi?id=43336 8 9 * DerivedSources.pro: Added WebKit2/DerivedSources.pro to SUBDIRS if webkit2 is on. 10 1 11 2010-07-30 Patrick Gansterer <paroga@paroga.com> 2 12 -
trunk/DerivedSources.pro
r54420 r64460 6 6 WebCore/DerivedSources.pro \ 7 7 WebKit/qt/Api/DerivedSources.pro 8 9 webkit2 { 10 SUBDIRS += WebKit2/DerivedSources.pro 11 } 8 12 9 13 for(subpro, SUBDIRS) { -
trunk/WebCore/ChangeLog
r64458 r64460 1 2010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Generate forwarding headers for WebKit2 6 7 https://bugs.webkit.org/show_bug.cgi?id=43336 8 9 * WebCore.pri: Removed header copying logic. 10 * WebCore.pro: Add include paths for WebKit2. 11 1 12 2010-08-02 Andrey Kosyakov <caseq@chromium.org> 2 13 -
trunk/WebCore/WebCore.pri
r64358 r64460 668 668 INSPECTOR_INTERFACES = inspector/Inspector.idl 669 669 670 WEBCORE_HEADERS_FOR_WEBKIT2 += \671 bindings/js/DOMWrapperWorld.h \672 platform/FileChooser.h \673 platform/network/qt/ResourceError.h \674 platform/network/qt/ResourceRequest.h \675 platform/network/qt/ResourceResponse.h \676 dom/KeyboardEvent.h \677 editing/EditCommand.h \678 history/BackForwardList.h \679 history/BackForwardControllerClient.h \680 history/HistoryItem.h \681 html/HTMLFormElement.h \682 html/HTMLFrameOwnerElement.h \683 inspector/InspectorClient.h \684 loader/appcache/ApplicationCacheStorage.h \685 loader/DocumentLoader.h \686 loader/FormState.h \687 loader/FrameLoader.h \688 loader/FrameLoaderClient.h \689 loader/FrameLoaderTypes.h \690 loader/PolicyChecker.h \691 loader/ProgressTracker.h \692 page/animation/AnimationController.h \693 page/Chrome.h \694 page/ChromeClient.h \695 page/ContextMenuClient.h \696 page/DragClient.h \697 page/EditorClient.h \698 page/EventHandler.h \699 page/FocusController.h \700 page/Frame.h \701 page/FrameLoadRequest.h \702 page/FrameView.h \703 page/Page.h \704 page/Settings.h \705 page/WindowFeatures.h \706 platform/Cursor.h \707 platform/PlatformKeyboardEvent.h \708 platform/PlatformMouseEvent.h \709 platform/PlatformWheelEvent.h \710 platform/Widget.h \711 platform/KURL.h \712 platform/graphics/Color.h \713 platform/graphics/ColorSpace.h \714 platform/graphics/GraphicsTypes.h \715 platform/graphics/Image.h \716 platform/graphics/ImageSource.h \717 platform/graphics/FloatRect.h \718 platform/graphics/GraphicsContext.h \719 platform/graphics/GraphicsLayerClient.h \720 platform/graphics/IntPoint.h \721 platform/graphics/IntRect.h \722 platform/graphics/IntSize.h \723 platform/graphics/Tile.h \724 platform/graphics/TiledBackingStore.h \725 platform/graphics/TiledBackingStoreClient.h \726 platform/sql/SQLiteDatabase.h \727 platform/text/PlatformString.h \728 platform/text/StringImpl.h \729 platform/MIMETypeRegistry.h \730 rendering/RenderTreeAsText.h \731 plugins/PluginData.h \732 733 JSC_HEADERS_FOR_WEBKIT2 += \734 ../JavaScriptCore/runtime/JSObject.h \735 736 WEBKIT2_API_HEADERS += \737 ../WebKit2/UIProcess/API/C/WKAPICast.h \738 ../WebKit2/UIProcess/API/C/WKBase.h \739 ../WebKit2/UIProcess/API/C/WKContext.h \740 ../WebKit2/UIProcess/API/C/WKContextPrivate.h \741 ../WebKit2/UIProcess/API/C/WKFrame.h \742 ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \743 ../WebKit2/UIProcess/API/C/WKNavigationData.h \744 ../WebKit2/UIProcess/API/C/WKPage.h \745 ../WebKit2/UIProcess/API/C/WKPageNamespace.h \746 ../WebKit2/UIProcess/API/C/WKPagePrivate.h \747 ../WebKit2/UIProcess/API/C/WKPreferences.h \748 ../WebKit2/UIProcess/API/C/WKString.h \749 ../WebKit2/UIProcess/API/C/WKURL.h \750 ../WebKit2/UIProcess/API/C/WebKit2.h \751 ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \752 ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \753 ../WebKit2/UIProcess/API/qt/qwkpage.h \754 ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \755 ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \756 757 670 mathmlnames.output = $${WC_GENERATED_SOURCES_DIR}/MathMLNames.cpp 758 671 mathmlnames.input = MATHML_NAMES … … 918 831 webkitversion.wkAddOutputToSources = false 919 832 addExtraCompiler(webkitversion) 920 921 webkit2 {922 923 # GENERATOR 12: Copy WebCore headers for WebKit2924 webcoreheaders.output = ../include/WebCore/${QMAKE_FILE_BASE}.h925 webcoreheaders.input = WEBCORE_HEADERS_FOR_WEBKIT2926 webcoreheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}927 webcoreheaders.clean = ${QMAKE_FILE_OUT}928 webcoreheaders.wkAddOutputToSources = false929 addExtraCompiler(webcoreheaders)930 931 # GENERATOR 12-B: Copy JavaScriptCore headers for WebKit2932 jscheaders.output = ../include/JavaScriptCore/${QMAKE_FILE_BASE}.h933 jscheaders.input = JSC_HEADERS_FOR_WEBKIT2934 jscheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}935 jscheaders.clean = ${QMAKE_FILE_OUT}936 jscheaders.wkAddOutputToSources = false937 addExtraCompiler(jscheaders)938 939 # GENERATOR 13: Copy WebKit2 headers940 webkit2headers.output = ../include/WebKit2/${QMAKE_FILE_BASE}.h941 webkit2headers.input = WEBKIT2_API_HEADERS942 webkit2headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}943 webkit2headers.clean = ${QMAKE_FILE_OUT}944 webkit2headers.wkAddOutputToSources = false945 addExtraCompiler(webkit2headers)946 947 } -
trunk/WebCore/WebCore.pro
r64425 r64460 3387 3387 ../WebKit2/WebProcess/qt/WebProcessMainQt.cpp 3388 3388 3389 INCLUDEPATH = \ 3390 $$OUTPUT_DIR/WebCore/generated \ 3391 $$INCLUDEPATH \ 3392 $$OUPUT_DIR/include 3393 3389 3394 } 3390 3395 -
trunk/WebKit2/ChangeLog
r64449 r64460 1 2010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Generate forwarding headers for WebKit2 6 7 https://bugs.webkit.org/show_bug.cgi?id=43336 8 9 * DerivedSources.pro: Added. 10 1 11 2010-08-01 Anders Carlsson <andersca@apple.com> 2 12 -
trunk/WebKitTools/ChangeLog
r64453 r64460 1 2010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Generate forwarding headers for WebKit2 6 7 https://bugs.webkit.org/show_bug.cgi?id=43336 8 9 * Scripts/webkitdirs.pm: Call make on WebKit2/Makefile.DerivedSources. 10 1 11 2010-08-02 Fumitoshi Ukai <ukai@chromium.org> 2 12 -
trunk/WebKitTools/Scripts/webkitdirs.pm
r64039 r64460 1419 1419 print "Generating derived sources\n\n"; 1420 1420 1421 push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config"; 1422 1421 1423 my @dsQmakeArgs = @buildArgs; 1422 1424 push @dsQmakeArgs, "-r"; … … 1432 1434 1433 1435 # Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60 1434 for my $subdir ("JavaScriptCore", "WebCore", "WebKit/qt/Api") { 1436 my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api"); 1437 if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) { 1438 push @subdirs, "WebKit2"; 1439 } 1440 1441 for my $subdir (@subdirs) { 1435 1442 print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/$subdir\n\n"; 1436 1443 if ($make eq "nmake") { … … 1446 1453 } 1447 1454 1448 push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";1449 1455 push @buildArgs, sourceDir() . "/WebKit.pro"; 1450 1456 if ($config =~ m/debug/i) {
Note: See TracChangeset
for help on using the changeset viewer.