summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-06 11:37:15 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-06 11:37:15 (GMT)
commitf577abca43ec341ac4b96d5a9fb6fcfdc7411965 (patch)
tree0df451f4de071f2e055cd3850a1513ef9ecab2e0 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
parent31f4e677256487e7d167517ffd5dd4bef6bb4dd4 (diff)
parent1b7d4d29d970405d5559c5641260ea1f09375b27 (diff)
downloadQt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.zip
Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.gz
Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
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