Log Message
[Qt] Fix make install on Windows https://bugs.webkit.org/show_bug.cgi?id=94816
Reviewed by Laszlo Gombos. 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126426 => 126427)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 15:08:29 UTC (rev 126426)
+++ trunk/Source/WebCore/ChangeLog 2012-08-23 15:09:34 UTC (rev 126427)
@@ -1,3 +1,20 @@
+2012-08-23 Simon Hausmann <[email protected]>
+
+ [Qt] Fix make install on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=94816
+
+ Reviewed by Laszlo Gombos.
+
+ 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 Pavel Feldman <[email protected]>
Web Inspector: extract ParsedURL into a separate file.
Modified: trunk/Source/WebCore/WebCore.pri (126426 => 126427)
--- trunk/Source/WebCore/WebCore.pri 2012-08-23 15:08:29 UTC (rev 126426)
+++ trunk/Source/WebCore/WebCore.pri 2012-08-23 15:09:34 UTC (rev 126427)
@@ -217,13 +217,6 @@
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
}
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-changes
