Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/WebCore/WebCore.pro

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/WebKit/WebCore/GNUmakefile.am ('k') | third_party/WebKit/WebCore/WebCore.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <<<<<<< .working 1 <<<<<<< .working
2 # WebCore - qmake build info 2 # WebCore - qmake build info
3 CONFIG += building-libs 3 CONFIG += building-libs
4 CONFIG += depend_includepath 4 CONFIG += depend_includepath
5 include($$PWD/../WebKit.pri) 5 include($$PWD/../WebKit.pri)
6 6
7 TEMPLATE = lib 7 TEMPLATE = lib
8 TARGET = QtWebKit 8 TARGET = QtWebKit
9 9
10 contains(QT_CONFIG, embedded):CONFIG += embedded 10 contains(QT_CONFIG, embedded):CONFIG += embedded
(...skipping 2605 matching lines...) Expand 10 before | Expand all | Expand 10 after
2616 dom/BeforeUnloadEvent.cpp \ 2616 dom/BeforeUnloadEvent.cpp \
2617 dom/CDATASection.cpp \ 2617 dom/CDATASection.cpp \
2618 dom/CharacterData.cpp \ 2618 dom/CharacterData.cpp \
2619 dom/ChildNodeList.cpp \ 2619 dom/ChildNodeList.cpp \
2620 dom/ClassNames.cpp \ 2620 dom/ClassNames.cpp \
2621 dom/ClassNodeList.cpp \ 2621 dom/ClassNodeList.cpp \
2622 dom/Clipboard.cpp \ 2622 dom/Clipboard.cpp \
2623 dom/ClipboardEvent.cpp \ 2623 dom/ClipboardEvent.cpp \
2624 dom/Comment.cpp \ 2624 dom/Comment.cpp \
2625 dom/ContainerNode.cpp \ 2625 dom/ContainerNode.cpp \
2626 dom/CrossThreadCopier.cpp \
2626 dom/CSSMappedAttributeDeclaration.cpp \ 2627 dom/CSSMappedAttributeDeclaration.cpp \
2627 dom/Document.cpp \ 2628 dom/Document.cpp \
2628 dom/DocumentFragment.cpp \ 2629 dom/DocumentFragment.cpp \
2629 dom/DocumentType.cpp \ 2630 dom/DocumentType.cpp \
2630 dom/DOMImplementation.cpp \ 2631 dom/DOMImplementation.cpp \
2631 dom/DOMStringList.cpp \ 2632 dom/DOMStringList.cpp \
2632 dom/DynamicNodeList.cpp \ 2633 dom/DynamicNodeList.cpp \
2633 dom/EditingText.cpp \ 2634 dom/EditingText.cpp \
2634 dom/Element.cpp \ 2635 dom/Element.cpp \
2635 dom/Entity.cpp \ 2636 dom/Entity.cpp \
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
2859 loader/NavigationAction.cpp \ 2860 loader/NavigationAction.cpp \
2860 loader/NetscapePlugInStreamLoader.cpp \ 2861 loader/NetscapePlugInStreamLoader.cpp \
2861 loader/PluginDocument.cpp \ 2862 loader/PluginDocument.cpp \
2862 loader/ProgressTracker.cpp \ 2863 loader/ProgressTracker.cpp \
2863 loader/Request.cpp \ 2864 loader/Request.cpp \
2864 loader/ResourceLoader.cpp \ 2865 loader/ResourceLoader.cpp \
2865 loader/SubresourceLoader.cpp \ 2866 loader/SubresourceLoader.cpp \
2866 loader/TextDocument.cpp \ 2867 loader/TextDocument.cpp \
2867 loader/TextResourceDecoder.cpp \ 2868 loader/TextResourceDecoder.cpp \
2868 loader/ThreadableLoader.cpp \ 2869 loader/ThreadableLoader.cpp \
2870 loader/WorkerThreadableLoader.cpp \
2869 page/AccessibilityImageMapLink.cpp \ 2871 page/AccessibilityImageMapLink.cpp \
2870 page/AccessibilityObject.cpp \ 2872 page/AccessibilityObject.cpp \
2871 page/AccessibilityList.cpp \ 2873 page/AccessibilityList.cpp \
2872 page/AccessibilityListBox.cpp \ 2874 page/AccessibilityListBox.cpp \
2873 page/AccessibilityListBoxOption.cpp \ 2875 page/AccessibilityListBoxOption.cpp \
2874 page/AccessibilityRenderObject.cpp \ 2876 page/AccessibilityRenderObject.cpp \
2875 page/AccessibilityTable.cpp \ 2877 page/AccessibilityTable.cpp \
2876 page/AccessibilityTableCell.cpp \ 2878 page/AccessibilityTableCell.cpp \
2877 page/AccessibilityTableColumn.cpp \ 2879 page/AccessibilityTableColumn.cpp \
2878 page/AccessibilityTableHeaderContainer.cpp \ 2880 page/AccessibilityTableHeaderContainer.cpp \
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
4102 } 4104 }
4103 } 4105 }
4104 4106
4105 CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4 ) { 4107 CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4 ) {
4106 # start with 4.5 4108 # start with 4.5
4107 CONFIG -= separate_debug_info 4109 CONFIG -= separate_debug_info
4108 CONFIG += no_debug_info 4110 CONFIG += no_debug_info
4109 } 4111 }
4110 4112
4111 >>>>>>> .merge-right.r40314 4113 >>>>>>> .merge-right.r40314
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/GNUmakefile.am ('k') | third_party/WebKit/WebCore/WebCore.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698