diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-02 08:50:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-02 08:50:09 (GMT) |
| commit | e6a1cbed3f72cd41110e40c606acb27a1020644e (patch) | |
| tree | e82adafede3300ab91a4bfaf233cc4abe4e6579d /src/script/script.pro | |
| parent | 3a19d617593e324773feae87663d0cfa0d65569a (diff) | |
| parent | b991134fe4d90fcd46bab50ba164f2c28b8942db (diff) | |
| download | Qt-e6a1cbed3f72cd41110e40c606acb27a1020644e.zip Qt-e6a1cbed3f72cd41110e40c606acb27a1020644e.tar.gz Qt-e6a1cbed3f72cd41110e40c606acb27a1020644e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Don't allow non-Object values to be set as prototype
Enable QtScript/JavaScriptCore ASSERTs in debug mode
Don't assert in abortEvaluation() autotest
Avoid asserting when computing line number for backtrace
Make missing line number info an expected failure
Diffstat (limited to 'src/script/script.pro')
| -rw-r--r-- | src/script/script.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index ce5c778..c558ba8 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -73,7 +73,7 @@ INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated # This line copied from WebCore.pro DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 -DEFINES += NDEBUG +CONFIG(release, debug|release):DEFINES += NDEBUG solaris-g++:isEqual(QT_ARCH,sparc) { CONFIG -= separate_debug_info |