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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 21165: Revert the merge. Mac build is mysteriously broken. (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 # WebCore - qmake build info 1 # WebCore - qmake build info
2 CONFIG += building-libs 2 CONFIG += building-libs
3 CONFIG += depend_includepath 3 CONFIG += depend_includepath
4 include($$PWD/../WebKit.pri) 4 include($$PWD/../WebKit.pri)
5 5
6 TEMPLATE = lib 6 TEMPLATE = lib
7 TARGET = QtWebKit 7 TARGET = QtWebKit
8 8
9 contains(QT_CONFIG, embedded):CONFIG += embedded 9 contains(QT_CONFIG, embedded):CONFIG += embedded
10 10
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 dom/DOMCoreException.idl \ 274 dom/DOMCoreException.idl \
275 dom/DOMImplementation.idl \ 275 dom/DOMImplementation.idl \
276 dom/DOMStringList.idl \ 276 dom/DOMStringList.idl \
277 dom/Element.idl \ 277 dom/Element.idl \
278 dom/Entity.idl \ 278 dom/Entity.idl \
279 dom/EntityReference.idl \ 279 dom/EntityReference.idl \
280 dom/Event.idl \ 280 dom/Event.idl \
281 dom/EventException.idl \ 281 dom/EventException.idl \
282 # dom/EventListener.idl \ 282 # dom/EventListener.idl \
283 # dom/EventTarget.idl \ 283 # dom/EventTarget.idl \
284 dom/EventTargetNode.idl \
284 dom/KeyboardEvent.idl \ 285 dom/KeyboardEvent.idl \
285 dom/MouseEvent.idl \ 286 dom/MouseEvent.idl \
286 dom/MessageChannel.idl \ 287 dom/MessageChannel.idl \
287 dom/MessageEvent.idl \ 288 dom/MessageEvent.idl \
288 dom/MessagePort.idl \ 289 dom/MessagePort.idl \
289 dom/MutationEvent.idl \ 290 dom/MutationEvent.idl \
290 dom/NamedNodeMap.idl \ 291 dom/NamedNodeMap.idl \
291 dom/Node.idl \ 292 dom/Node.idl \
292 dom/NodeFilter.idl \ 293 dom/NodeFilter.idl \
293 dom/NodeIterator.idl \ 294 dom/NodeIterator.idl \
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 bindings/js/JSDocumentCustom.cpp \ 419 bindings/js/JSDocumentCustom.cpp \
419 bindings/js/JSDocumentFragmentCustom.cpp \ 420 bindings/js/JSDocumentFragmentCustom.cpp \
420 bindings/js/JSDOMGlobalObject.cpp \ 421 bindings/js/JSDOMGlobalObject.cpp \
421 bindings/js/JSDOMStringListCustom.cpp \ 422 bindings/js/JSDOMStringListCustom.cpp \
422 bindings/js/JSDOMWindowBase.cpp \ 423 bindings/js/JSDOMWindowBase.cpp \
423 bindings/js/JSDOMWindowCustom.cpp \ 424 bindings/js/JSDOMWindowCustom.cpp \
424 bindings/js/JSDOMWindowShell.cpp \ 425 bindings/js/JSDOMWindowShell.cpp \
425 bindings/js/JSElementCustom.cpp \ 426 bindings/js/JSElementCustom.cpp \
426 bindings/js/JSEventCustom.cpp \ 427 bindings/js/JSEventCustom.cpp \
427 bindings/js/JSEventTarget.cpp \ 428 bindings/js/JSEventTarget.cpp \
429 bindings/js/JSEventTargetNodeCustom.cpp \
428 bindings/js/JSGeolocationCustom.cpp \ 430 bindings/js/JSGeolocationCustom.cpp \
429 bindings/js/JSHTMLAllCollection.cpp \ 431 bindings/js/JSHTMLAllCollection.cpp \
430 bindings/js/JSHistoryCustom.cpp \ 432 bindings/js/JSHistoryCustom.cpp \
431 bindings/js/JSJavaScriptCallFrameCustom.cpp \ 433 bindings/js/JSJavaScriptCallFrameCustom.cpp \
432 bindings/js/JSHTMLAppletElementCustom.cpp \ 434 bindings/js/JSHTMLAppletElementCustom.cpp \
433 bindings/js/JSHTMLCollectionCustom.cpp \ 435 bindings/js/JSHTMLCollectionCustom.cpp \
434 bindings/js/JSHTMLDocumentCustom.cpp \ 436 bindings/js/JSHTMLDocumentCustom.cpp \
435 bindings/js/JSHTMLElementCustom.cpp \ 437 bindings/js/JSHTMLElementCustom.cpp \
436 bindings/js/JSHTMLEmbedElementCustom.cpp \ 438 bindings/js/JSHTMLEmbedElementCustom.cpp \
437 bindings/js/JSHTMLFormElementCustom.cpp \ 439 bindings/js/JSHTMLFormElementCustom.cpp \
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 dom/DOMImplementation.cpp \ 577 dom/DOMImplementation.cpp \
576 dom/DOMStringList.cpp \ 578 dom/DOMStringList.cpp \
577 dom/DynamicNodeList.cpp \ 579 dom/DynamicNodeList.cpp \
578 dom/EditingText.cpp \ 580 dom/EditingText.cpp \
579 dom/Element.cpp \ 581 dom/Element.cpp \
580 dom/Entity.cpp \ 582 dom/Entity.cpp \
581 dom/EntityReference.cpp \ 583 dom/EntityReference.cpp \
582 dom/Event.cpp \ 584 dom/Event.cpp \
583 dom/EventNames.cpp \ 585 dom/EventNames.cpp \
584 dom/EventTarget.cpp \ 586 dom/EventTarget.cpp \
587 dom/EventTargetNode.cpp \
585 dom/ExceptionBase.cpp \ 588 dom/ExceptionBase.cpp \
586 dom/ExceptionCode.cpp \ 589 dom/ExceptionCode.cpp \
587 dom/FormControlElementWithState.cpp \ 590 dom/FormControlElementWithState.cpp \
588 dom/FormControlElement.cpp \ 591 dom/FormControlElement.cpp \
589 dom/InputElement.cpp \ 592 dom/InputElement.cpp \
590 dom/KeyboardEvent.cpp \ 593 dom/KeyboardEvent.cpp \
591 dom/MappedAttribute.cpp \ 594 dom/MappedAttribute.cpp \
592 dom/MessageChannel.cpp \ 595 dom/MessageChannel.cpp \
593 dom/MessageEvent.cpp \ 596 dom/MessageEvent.cpp \
594 dom/MessagePort.cpp \ 597 dom/MessagePort.cpp \
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after
2047 } 2050 }
2048 } 2051 }
2049 2052
2050 CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4 ) { 2053 CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4 ) {
2051 # start with 4.5 2054 # start with 4.5
2052 CONFIG -= separate_debug_info 2055 CONFIG -= separate_debug_info
2053 CONFIG += no_debug_info 2056 CONFIG += no_debug_info
2054 } 2057 }
2055 2058
2056 >>>>>>> .merge-right.r40314 2059 >>>>>>> .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