diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-02-23 14:38:58 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-02-23 14:39:09 (GMT) |
| commit | 45344965f1c6b0cd298a05beea3d74547c5a2a91 (patch) | |
| tree | 7c389e2a5fa912de0b40a5c43aa984738ddb38e6 /src/3rdparty/webkit/WebCore | |
| parent | f3be69195ebe94c003755a652a9ef9e8a3a898fe (diff) | |
| download | Qt-45344965f1c6b0cd298a05beea3d74547c5a2a91.zip Qt-45344965f1c6b0cd298a05beea3d74547c5a2a91.tar.gz Qt-45344965f1c6b0cd298a05beea3d74547c5a2a91.tar.bz2 | |
Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6d67fb964b71ed3e7361367c3ccfaba5e0a )
Changes in WebKit/qt since the last update:
- Fix build break on MacOSX
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 9 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 23 |
2 files changed, 19 insertions, 13 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 362834e..e83b003 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -44,6 +44,15 @@ * loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::handleDataLoadNow): clear m_initialRequest +2010-02-23 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> + + Reviewed by Laszlo Gombos. + + [Qt] Correct build problems while building QtWebKit inside Qt. + https://bugs.webkit.org/show_bug.cgi?id=34975 + + * WebCore.pro: Change the condition !standalone_package to !QTDIR_build + 2010-02-20 Laszlo Gombos <laszlo.1.gombos@nokia.com> Reviewed by Darin Adler. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index ba16754..63bd728 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -47,8 +47,9 @@ 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 + # Qt will set the version for us when building in Qt's tree CONFIG(QTDIR_build):include($$QT_SOURCE_TREE/src/qbase.pri) - else: VERSION = 4.7.0 + else: VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h DEFINES *= NDEBUG @@ -2691,19 +2692,15 @@ WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS QMAKE_EXTRA_TARGETS += install } -# Qt will set the version for us when building in Qt's tree -!CONFIG(QTDIR_build): VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} - -win32-*|wince* { - DLLDESTDIR = $$OUTPUT_DIR/bin - TARGET = $$qtLibraryTarget($$TARGET) - - dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS] - dlltarget.CONFIG = no_path - INSTALLS += dlltarget -} +!CONFIG(QTDIR_build) { + win32-*|wince* { + DLLDESTDIR = $$OUTPUT_DIR/bin + TARGET = $$qtLibraryTarget($$TARGET) -!CONFIG(standalone_package) { + dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS] + dlltarget.CONFIG = no_path + INSTALLS += dlltarget + } unix { CONFIG += create_pc create_prl |