diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 11:02:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | e8b154fd68f9b33be40a3590e58347f353835f5c (patch) | |
| tree | 0733ce26384183245aaa5656af26c653636fe6c1 /WebKit/qt/Api/DerivedSources.pro | |
| parent | da56157816334089526a7a115a85fd85a6e9a1dc (diff) | |
| download | external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.zip external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.gz external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.bz2 | |
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Diffstat (limited to 'WebKit/qt/Api/DerivedSources.pro')
| -rw-r--r-- | WebKit/qt/Api/DerivedSources.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro index 62546f6..86d5dac 100644 --- a/WebKit/qt/Api/DerivedSources.pro +++ b/WebKit/qt/Api/DerivedSources.pro @@ -10,15 +10,14 @@ DESTDIR = ../../../include/QtWebKit QUOTE = "" DOUBLE_ESCAPED_QUOTE = "" ESCAPE = "" -win32-msvc*|symbian { - ESCAPE = "^" -} else:win32-g++*:isEmpty(QMAKE_SH) { +contains(QMAKE_HOST.os, "Windows"):isEmpty(QMAKE_SH) { # MinGW's make will run makefile commands using sh, even if make # was run from the Windows shell, if it finds sh in the path. ESCAPE = "^" } else { QUOTE = "\'" DOUBLE_ESCAPED_QUOTE = "\\\'" + ESCAPE = "\\" } qtheader_module.target = $${DESTDIR}/QtWebKit |