summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2010-06-17 09:16:04 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2010-06-17 09:16:04 (GMT)
commit0a852d51c6d74712cda8c7d08da4f5c90d99d5cd (patch)
tree2ac9f365b8a25738d3756d051d7ccccea27bff7e /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
parentcf74e83d8b79c4840c073bb7dc387045b1210df8 (diff)
parente4fbdd4fde9b8d2acc13268b44caa57405c3db1a (diff)
downloadQt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.zip
Qt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.tar.gz
Qt-0a852d51c6d74712cda8c7d08da4f5c90d99d5cd.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
index 22fcc91..3f1ac86 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -43,7 +43,7 @@ CONFIG(QTDIR_build) {
}
# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
-win32-g++ {
+win32-g++* {
TMPPATH = $$quote($$(INCLUDE))
QMAKE_INCDIR_POST += $$split(TMPPATH,";")
TMPPATH = $$quote($$(LIB))