summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-30 07:08:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-30 07:08:43 (GMT)
commitf5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b (patch)
tree865471e5d53175f66e5a8e13926285c289ca1437 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
parent0eaa3466077839b0cef2ad6c326d80f398eccae7 (diff)
parentc1a90a535206e0a146e13c60d981a855178e69ca (diff)
downloadQt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.zip
Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.tar.gz
Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.tar.bz2
Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
index 28f0e6b..f881c05 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -33,8 +33,6 @@ INCLUDEPATH += $$GENERATED_SOURCES_DIR
}
}
-include($$OUTPUT_DIR/config.pri)
-
CONFIG -= warn_on
*-g++*:QMAKE_CXXFLAGS += -Wreturn-type -fno-strict-aliasing
#QMAKE_CXXFLAGS += -Wall -Wno-undef -Wno-unused-parameter