diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:04:55 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:04:55 +0200 |
| commit | 10ca2fc7fb098f16b107e991f6b38e703282d9c7 (patch) | |
| tree | 6ffe38ffa7be4fb45eedefc8b877eaacf37a6e01 | |
| parent | a73d1c176f2f3e0458861de8590dc20321a501ae (diff) | |
| download | qtwebkit-10ca2fc7fb098f16b107e991f6b38e703282d9c7.tar.gz | |
[Qt] Fix make install on Windows
https://bugs.webkit.org/show_bug.cgi?id=94816
Reviewed by NOBODY (OOPS!).
This old left-over rule for Windows to add dlltarget to INSTALLS caused
various bugs: WebCore's Makefile had an actual install target that
tried to install the WebCore static library and it also screwed up
api.pri's install rule by overriding what is usually set up for qt
modules, i.e. the install path was missing INSTALL_ROOT. We don't need
these rules at all, the default qmake features take care of setting up
target install rules accordingly.
* WebCore.pri:
| -rw-r--r-- | Source/WebCore/ChangeLog | 17 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 7 |
2 files changed, 17 insertions, 7 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 32cd892c8..66a1d36b9 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,22 @@ 2012-08-23 Simon Hausmann <simon.hausmann@nokia.com> + [Qt] Fix make install on Windows + https://bugs.webkit.org/show_bug.cgi?id=94816 + + Reviewed by NOBODY (OOPS!). + + This old left-over rule for Windows to add dlltarget to INSTALLS caused + various bugs: WebCore's Makefile had an actual install target that + tried to install the WebCore static library and it also screwed up + api.pri's install rule by overriding what is usually set up for qt + modules, i.e. the install path was missing INSTALL_ROOT. We don't need + these rules at all, the default qmake features take care of setting up + target install rules accordingly. + + * WebCore.pri: + +2012-08-23 Simon Hausmann <simon.hausmann@nokia.com> + Unreviewed trivial build fix for Qt/Mac on OS X 10.6: Avoid using an enum value that clashes with an existing class name that's used in the same file. diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 3390d4093..10181f50a 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -217,13 +217,6 @@ config_libwebp { LIBS += -lwebp } -win32-*|wince* { - DLLDESTDIR = $${ROOT_BUILD_DIR}/bin - - dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS] - dlltarget.CONFIG = no_path - INSTALLS += dlltarget -} mac { LIBS += -framework Carbon -framework AppKit } |