summaryrefslogtreecommitdiffstats
path: root/src/script/script.pro
Commit message (Collapse)AuthorAgeFilesLines
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-181-1/+1
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-03-021-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Enable QtScript/JavaScriptCore ASSERTs in debug modeKent Hansen2011-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The fact that QtWebKit disables asserts in debug mode doesn't mean QtScript should do the same. The asserts can make us aware of problems in our calls to JSC, and violations of internal assumptions in JSC (e.g. memory alignment). Task-number: QTBUG-17741 Reviewed-by: Olivier Goffart
* | Silence GHS compilerRolland Dudemaine2011-02-221-0/+4
|/ | | | | | | Remove some warnings for the GHS compiler Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-261-1/+0
|\
| * QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-251-1/+0
| | | | | | | | | | | | | | | | | | Cherry-picked from http://trac.webkit.org/changeset/56370 The old allocator caused QML to crash in MCL (TB10.1, week 1). Task-number: QTBUG-14293 Reviewed-by: Simon Hausmann
| * Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"Kent Hansen2011-01-251-0/+1
| | | | | | | | | | | | | | | | This reverts commit 7db489a0de073a2a56fe32d16f1cbe1bebdfd06d. The change to CollectorHeapIterator.h is not Symbian-specific and it introduced test failures on all platforms (tst_QScriptEngineAgent::positionChange_3()).
| * QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-251-1/+0
| | | | | | | | | | | | | | | | | | Cherry-picked from http://trac.webkit.org/changeset/56370 The old allocator caused QML to crash in MCL (TB10.1, week 1). Task-number: QTBUG-14293 Reviewed-by: Simon Hausmann
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-0/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Add compiler optimization for QtScript/JSC on SymbianKent Hansen2010-12-281-0/+10
| | | | | | | | | | | | | | | | | | Ported from http://trac.webkit.org/changeset/73126. This gives a ~70% performance improvement for the SunSpider and V8 benchmarks. Task-number: QTBUG-15847 Reviewed-by: Simon Hausmann
* | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
| | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-1/+9
|/ | | | Reviewed-by: Jørgen
* Reduce memory consumption of QtScript/JSC on SymbianKent Hansen2010-09-021-1/+4
| | | | | | | | | | | | | Backport of Jay's patch from https://bugs.webkit.org/show_bug.cgi?id=34349 with minor modifications. Even though the original patch was rejected upstream and has been superseded by the patches for https://bugs.webkit.org/show_bug.cgi?id=43185, those patches are more involved (affecting all platforms), hence difficult/risky to backport. Task-number: QTBUG-13361 Reviewed-by: Simon Hausmann
* Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile ↵Thiago Macieira2010-03-201-0/+3
| | | | any time soon with C++0x
* Fix JSC export macrosKent Hansen2010-03-181-1/+1
| | | | | | If we're building QtScript, we want the JS_EXPORTDATA and JS_EXPORTCLASS to expand to nothing. This avoids the macros being redefined (incorrectly) on MSVC.
* Define JS_NO_EXPORT to avoid JSC C API functions being exportedKent Hansen2010-03-161-1/+1
| | | | | | script.pro was defining JS_EXPORT in an attempt to avoid exporting, but JSBase.h unconditionally undefines it, and redefines based on JS_NO_EXPORT. So define that one instead.
* Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update qscriptvalueiterator test to expect length property when iterating arrays and strings. - Use EvalExecutable::create() instead of EvalExecutable constructor. The constructor is private. - Reimplement getOwnPropertyDescriptor() in all custom script objects. - Remove all reimplementations of getPropertyAttributes(). It doesn't exist in trunk anymore (getOwnPropertyDescriptor() is used instead). - Remove checkDontDelete argument from deleteProperty() reimplementations. The purpose of this argument was to support deleting properties with attribute Undeletable from C++. But it was quite an invasive patch to JavaScriptCore, and it doesn't seem worth it. If this feature is really crucial it should be re-done upstream. One of the tests needed to be updated so it's not sensitive to the C++ undeletability. - Adapt getOwnPropertyNames() reimplementations to signature change. - Add missing QScriptObject structure flags, otherwise we don't get all virtual calls. - Remove our patch for reporting column numbers in the debugger callbacks. It was just too intrusive. As with the checkDontDelete issue, this should be redone upstream if it's really important. In 4.7, QScriptEngineAgent will always report a column number of 1. Other compilation fixes: - InternalFunction::name() takes an ExecState* argument, not GlobalData* - ScopeChain::globalObject is no longer a function but a member variable - ScopeChainNode constructor takes a GlobalObject argument - Heap::collect() is called collectAllGarbage() - JSValue::strictEqual() takes an ExecState* argument - Debugger::exception() takes a bool hasHandler argument - Debugger no longer reports column number (we decided to drop that patch from JSC) - UString doesn't have operator+=(char*) - Update the autotests to reflect the columnNumber=1 change. - Add helper class to avoid crashing inside JSC. Ever since r52856 in WebKit trunk, this is needed. There are probably a lot of other public API functions that need this guard as well, but I'll add them as they are discovered. - Update mkdist-javascriptcore tag, exclude a few more files. - Set ENABLE_JSC_MULTIPLE_THREADS=0 define on Mac due to r52355 in trunk. Reviewed-by: Simon Hausmann
* Fix miracously exported WTF symbols in QtScript with the Maemo 5 toolchain.Lars Knoll2009-11-271-1/+1
| | | | | | | Rename the WTF namespace. Task-number: http://bugreports.qt.nokia.com/browse/QTBUG-5513 Reviewed-by: Simon Hausmann
* Prospective solaris-g++-sparc build fixSimon Hausmann2009-09-301-0/+5
| | | | | | | | | | g++ on sparc appears to have problems inlining functions when Qt is compiled in debug. ("sorry: unimplemented blah blah") We're not entirely sure, but we suspect that removing -g might help avoid this compiler bug. Reviewed-by: Kent Hansen
* avoid JavaScriptCore C API functions being exported from QtScript libraryKent Hansen2009-09-301-0/+3
| | | | Reviewed-by: Simon Hausmann
* Update src/3rdparty/javascriptcore and adapt src/script to the changes.Kent Hansen2009-09-241-21/+10
| | | | Reviewed-by: Simon Hausmann
* work around another set of duplicated symbols between webkit and scriptLars Knoll2009-09-221-1/+1
| | | | | | jscyyerror/parse/lex where exported on some platforms. Reviewed-By: Simon Hausmann
* Fix symbol clashes between QtWebKit and QtScriptSimon Hausmann2009-09-181-0/+1
| | | | | | Rename the JSC namespace to QTJSC. Reviewed-by: Lars Knoll
* Separate the copy of JavaScriptCore that QtScript uses from the copy thatSimon Hausmann2009-09-161-1/+1
| | | | | | | | | QtWebKit uses. This is needed to decouple QtScript from QtWebKit, as discussed in the WebKit team. Reviewed-by: Kent Hansen
* Fix QtScript compilation against external JSC sourcesSimon Hausmann2009-09-091-9/+10
| | | | | | | Print a message when doing so and don't re-define qmake functions that come from JavaScriptCore.pri. Reviewed-by: Trust me
* don't disable the JIT for qtscriptKent Hansen2009-08-311-2/+0
| | | | AKA, enable it on platforms where it's supported.
* disable a few compiler warnings for qtscript/JavaScriptCore on WindowsKent Hansen2009-08-271-0/+3
| | | | | | | | We do it when compiling JavaScriptCore as part of QtWebKit, so do it when compiling it as part of QtScript as well, otherwise the excess warning output is just ridiculous. Adopted from patch at https://bugs.webkit.org/show_bug.cgi?id=27709
* Merge commit 'qt/master'Jason Barron2009-08-211-0/+9
|\
| * get rid of qmake warnings when parsing script.pro (JavaScriptCore.pri)Kent Hansen2009-08-211-0/+9
| |
* | Merge commit 'qt/master'Jason Barron2009-08-211-0/+54
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * Build on Windows CEKent Hansen2009-08-171-0/+8
| |
| * Fix inclusions of "utils/qscriptdate_p.h" with msvcSimon Hausmann2009-08-141-0/+2
| | | | | | | | | | | | Don't rely on the current working directory being src/script, as that does not appear to be the case when building with .vcproj files. Instead add src/script to the INCLUDEPATH, so that the above inclusion works.
| * get rid of src/script/webkit.priKent Hansen2009-08-131-1/+44
| | | | | | | | Not needed since commit 9727a71ea077658148e963bc8510269b08095023.
| * QtScript building system changeJedrzej Nowacki2009-08-111-0/+2
| | | | | | | | | | | | | | | | Make new dependency: QScripttools on Webkit. This change is needed to implement QScriptEngineAgent as child of JSC::Debugger. Exclude common part from scripttool.pri and script.pri and move it to webkit.pri
| * Long live Qt!Lars Knoll2009-03-231-0/+12
|
* Long live Qt for S60!axis2009-04-241-0/+14
generated by cgit v0.12 at 2024-11-01 10:02:23 (GMT)