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

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

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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
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 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 platform/DragImage.cpp \ 817 platform/DragImage.cpp \
818 platform/FileChooser.cpp \ 818 platform/FileChooser.cpp \
819 platform/GeolocationService.cpp \ 819 platform/GeolocationService.cpp \
820 platform/graphics/FontDescription.cpp \ 820 platform/graphics/FontDescription.cpp \
821 platform/graphics/FontFamily.cpp \ 821 platform/graphics/FontFamily.cpp \
822 platform/graphics/AffineTransform.cpp \ 822 platform/graphics/AffineTransform.cpp \
823 platform/graphics/BitmapImage.cpp \ 823 platform/graphics/BitmapImage.cpp \
824 platform/graphics/Color.cpp \ 824 platform/graphics/Color.cpp \
825 platform/graphics/FloatPoint3D.cpp \ 825 platform/graphics/FloatPoint3D.cpp \
826 platform/graphics/FloatPoint.cpp \ 826 platform/graphics/FloatPoint.cpp \
827 platform/graphics/FloatQuad.cpp \
827 platform/graphics/FloatRect.cpp \ 828 platform/graphics/FloatRect.cpp \
828 platform/graphics/FloatSize.cpp \ 829 platform/graphics/FloatSize.cpp \
829 platform/graphics/FontData.cpp \ 830 platform/graphics/FontData.cpp \
830 platform/graphics/GeneratedImage.cpp \ 831 platform/graphics/GeneratedImage.cpp \
831 platform/graphics/Gradient.cpp \ 832 platform/graphics/Gradient.cpp \
832 platform/graphics/GraphicsContext.cpp \ 833 platform/graphics/GraphicsContext.cpp \
833 platform/graphics/GraphicsTypes.cpp \ 834 platform/graphics/GraphicsTypes.cpp \
834 platform/graphics/Image.cpp \ 835 platform/graphics/Image.cpp \
835 platform/graphics/IntRect.cpp \ 836 platform/graphics/IntRect.cpp \
836 platform/graphics/Path.cpp \ 837 platform/graphics/Path.cpp \
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
1895 CONFIG += create_pc create_prl 1896 CONFIG += create_pc create_prl
1896 QMAKE_PKGCONFIG_LIBDIR = $$target.path 1897 QMAKE_PKGCONFIG_LIBDIR = $$target.path
1897 QMAKE_PKGCONFIG_INCDIR = $$headers.path 1898 QMAKE_PKGCONFIG_INCDIR = $$headers.path
1898 QMAKE_PKGCONFIG_DESTDIR = pkgconfig 1899 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
1899 lib_replace.match = $$DESTDIR 1900 lib_replace.match = $$DESTDIR
1900 lib_replace.replace = $$[QT_INSTALL_LIBS] 1901 lib_replace.replace = $$[QT_INSTALL_LIBS]
1901 QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace 1902 QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
1902 } 1903 }
1903 } 1904 }
1904 1905
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/GNUmakefile.am ('k') | third_party/WebKit/WebCore/WebCore.vcproj/WebCore.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698