summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into androidwip/androidEskil Abrahamsen Blomfeldt2013-02-08267-475/+824
|\ | | | | | | Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
| * Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-0728-114/+509
| |\ | | | | | | | | | refs/staging/dev
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-0528-114/+509
| | |\ | | | | | | | | | | | | Change-Id: Ib100dac4eccddf7a72382b7d1ead7d504a572347
| | | * Merge branch 'release' into stableSergio Ahumada2013-01-3113-17/+412
| | | |\ | | | | | | | | | | | | | | | Change-Id: If3a1efe3888b872702d75e25d1943ff79d57e9c6
| | | | * Fix QtScript crash on 64bit with JIT.v5.0.1Friedemann Kleint2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During back-trace generation we calculate a code offset towards JIT generated code. Using JITCode::offsetOf() will crash/assert if the offset doesn't fit into 32 bits, because the generated code can only encode relative offsets in 32-bits and not 64-bits. However in this context - backtrace generation - we just want to calculate the offset and are not interested in this architectural limitation, therefore we can just calculate the offset ourselves using the fully sized uintptr_t. Initial-patch-by: [email protected] Task-number: QTCREATORBUG-8629 Task-number: QTBUG-23463 Change-Id: I0efadd5ed20855409122e1fcc9236fdfbc4f62a4 Reviewed-by: Olivier Goffart <[email protected]>
| | | | * Doc: Modularized Qt Script Tools documentation.Jerome Pasion2013-01-2412-15/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -moved content from qtdoc -moved snippets to src/scripttools -enabled 'make docs' -edited QScriptEngineDebugger with the proper module identifier -created two way links from Qt Script to Qt Script Tools Change-Id: I83a76278969528dcb1ecbca4acc8563fe9390978 Reviewed-by: Jędrzej Nowacki <[email protected]> Reviewed-by: Geir Vattekar <[email protected]>
| | | | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f7eec61e442831b82aed579dd1526a12ebd71c8 Reviewed-by: hjk <[email protected]>
| | | * | Doc: Fix module name formatSze Howe Koh2013-01-2617-97/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtScript -> Qt Script QtScriptTools -> Qt Script Tools Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51 Reviewed-by: Jerome Pasion <[email protected]>
| * | | | Fix compile error caused by min/max defines.Friedemann Kleint2013-02-051-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtbase d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0 introduces a check for min/max which causes a compile error. Change-Id: I6a79e75423baa3f577eb26697e2766e58040b7d9 Reviewed-by: Jocelyn Turcotte <[email protected]>
| * / / Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2815-60/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: I7fed9ff47fd84f6cf2b418658a1ee3e7130539ac Reviewed-by: Jędrzej Nowacki <[email protected]>
| * | Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gbAndy Shaw2013-01-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a reported problem where the reserving of 2gb was too big under certain circumstances then in order to provide a means for people who hit this problem a define is added so that the VM_POOL_SIZE is set to be 1gb instead. This is an optional define and the default is for the size to be 2gb which keeps it to current behavior. Change-Id: I73200e1bcfcf7b37c6ba62f8b7bcf217f239dfcb Reviewed-by: Jędrzej Nowacki <[email protected]>
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-10240-242/+242
| | | | | | | | | | | | | | | | | | Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b Reviewed-by: Akseli Salovaara <[email protected]> Reviewed-by: Sergio Ahumada <[email protected]>
| * | make use of qtHaveModule()Oswald Buddenhagen2013-01-103-3/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: I440b609d23570293f21f21a2cb31854366d06bf7 Reviewed-by: Tasuku Suzuki <[email protected]> Reviewed-by: Sergio Ahumada <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
| * | Fix Math.pow implementation with MinGW-w64Jonathan Liu2013-01-091-7/+23
| |/ | | | | | | | | | | | | Adapted from WebKit changes 137895, 138705, 138894 and 138903. Change-Id: I166f8837e898d17d71ce4e4cab8ab45ea49de39c Reviewed-by: Simon Hausmann <[email protected]>
| * remove obsolete DEPENDPATH assignmentsv5.0.0Oswald Buddenhagen2012-12-162-2/+0
| | | | | | | | | | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I0804385b636d6f5b3b0136cc472a1f9ecb7b7871 Reviewed-by: Joerg Bornemann <[email protected]>
| * remove unnecessary CONFIG additionOswald Buddenhagen2012-12-161-2/+0
| | | | | | | | | | | | | | depend_includepath is already added by default_pre.prf. Change-Id: I92aa1f2d1408e4d7cdbfa8c3b24aaaba6c8b4810 Reviewed-by: Joerg Bornemann <[email protected]>
| * purge ce-compat referencesOswald Buddenhagen2012-12-123-2/+28
| | | | | | | | | | | | | | | | adapted from WebKit changes 125004 & 125018. Change-Id: Id051375924ece634acf2c0564a39c2d4b1cebe3c Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Simon Hausmann <[email protected]>
| * Add PLUGIN_CLASS_NAME to qtscript pluginsMiikka Heikkinen2012-12-101-0/+1
| | | | | | | | | | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ie9d95bcccc4358656d4e038850818606644aa8d3 Reviewed-by: Oswald Buddenhagen <[email protected]>
| * Doc: Replace outdated macroChristian Stenger2012-12-071-2/+2
| | | | | | | | | | Change-Id: I7750e9af3eee8cee5be202094acd1d3efc4b52b0 Reviewed-by: Jerome Pasion <[email protected]>
| * Change copyrights from Nokia to DigiaSergio Ahumada2012-12-058-8/+8
| | | | | | | | | | Change-Id: I70a3156710a37b02417c7d6c7c6c1ee222da0281 Reviewed-by: Lars Knoll <[email protected]>
| * QtScript: Fix link to Qt Linguist Manual.David Schulz2012-12-042-2/+2
| | | | | | | | | | Change-Id: I543eee28fa1f72d2b9371b39906fd3f0219cc000 Reviewed-by: Leena Miettinen <[email protected]>
| * remove symbian vestigesOswald Buddenhagen2012-12-044-33/+3
| | | | | | | | | | Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e Reviewed-by: Joerg Bornemann <[email protected]>
| * Doc: Changed link in qdocconf file to point to landing page.Jerome Pasion2012-12-031-2/+3
| | | | | | | | | | | | | | -affects the QCH file. Change-Id: I05d38a4bdeca359ff6f58c434e6d61198487d2a5 Reviewed-by: Kai Koehne <[email protected]>
* | Fix compile on AndroidBogDan Vatra2013-01-104-13/+38
|/ | | | | Change-Id: I3ce24b4a83673f3ebadbe6b4b9f595c93abfb8d5 Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
* Fix up the Qt Script docsLars Knoll2012-11-293-92/+48
| | | | | Change-Id: I20e6d2fca4faef1586b5da3ff494fb8196645f34 Reviewed-by: Jerome Pasion <[email protected]>
* Change copyright holder from Nokia to DigiaSergio Ahumada2012-11-271-1/+1
| | | | | Change-Id: I3a9c2dbe0262d5139314b7447adce8bbb599f9b8 Reviewed-by: Lars Knoll <[email protected]>
* Updated the module overviewLars Knoll2012-11-271-26/+36
| | | | | | | | | | | Mention the JS functionality in Qt Qml, and that Qt Qml can be an option for the commercial customers that can't use LGPL'ed code. Change-Id: Ibbefa160711820fb6235aa312a375e1b1b9d0b16 Reviewed-by: Jędrzej Nowacki <[email protected]> Reviewed-by: Sami Makkonen <[email protected]> Reviewed-by: Paul Olav Tvete <[email protected]>
* Always get the default flags from QAIM.Stephen Kelly2012-11-272-2/+2
| | | | | Change-Id: I9171bce02bc1cd0973fee43af1774f887b4f8668 Reviewed-by: Jędrzej Nowacki <[email protected]>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-201-1/+0
|\ | | | | | | Change-Id: If2ee8fc472ef47e24967c29f5ba39b92e4b41098
| * Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-291-1/+0
| | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I8f4ce0d4f7b9a5a713f8b6ad81828c00f3607b27 Reviewed-by: Martin Smith <[email protected]>
* | adjust to qt_plugin.prf changesv5.0.0-beta2Oswald Buddenhagen2012-11-011-4/+3
| | | | | | | | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I7f9c80f78e421ade15621459c600c94e01488667 Reviewed-by: Joerg Bornemann <[email protected]>
* | Fix mmap usage.Jędrzej Nowacki2012-10-221-2/+2
|/ | | | | | | | | | Add missing MAP_NORESERVE, and fix error checking. Special thanks to Olivier JG for debugging the issue. Task-number: QTBUG-27322 Change-Id: Ic4d5aa5849b9b5500fd3065aad5c86dd089a850b Reviewed-by: Simon Hausmann <[email protected]>
* Update docs after modularization of docsTor Arne Vestbø2012-10-112-5/+4
| | | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: Ia10e092bb6780d379dacafe0a10a6b78ce7f9a6c Reviewed-by: Martin Smith <[email protected]> Reviewed-by: Jerome Pasion <[email protected]>
* Doc: Updated include statements to point to the doc/global templatesVenugopal Shivashankar2012-09-281-2/+2
| | | | | Change-Id: Ifdf1bb4b4bbb77cb8f5d5d4a3a6108763b672c57 Reviewed-by: Jerome Pasion <[email protected]>
* Fix header guardLars Knoll2012-09-251-0/+1
| | | | | Change-Id: I22bba8d2d175d787913d1e2269ad2ca8ff762043 Reviewed-by: Simon Hausmann <[email protected]>
* Doc: Changed title of Qt Script module pageGeir Vattekar2012-09-241-1/+1
| | | | | Change-Id: I9d4f8b6b3af98bb8cc7a4b773a5c663691e5476b Reviewed-by: Jerome Pasion <[email protected]>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24233-3858/+3858
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id0b72b8c895b0eab04a740bf83859c9b646dd911 Reviewed-by: Janne Anttila <[email protected]> Reviewed-by: Sergio Ahumada <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-113-6/+0
| | | | | Change-Id: I1d95fe8089d8384563654630b9f4b201245887b9 Reviewed-by: Joerg Bornemann <[email protected]>
* Fix MinGW-w64 compilationJonathan Liu2012-09-041-1/+1
| | | | | | | | | | ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not available with MinGW-w64. Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Yuchen Deng <[email protected]> Reviewed-by: Simon Hausmann <[email protected]>
* Capture full backtrace when a native function calls back into JSKent Hansen2012-08-221-2/+10
| | | | | | | | | | | | | | | | | | | | | | Commit df0ec196031d33850324dc5eeed2d71f61413885 assumed that JSC's Interpreter::throwException function is called exactly once when an exception occurs. That's wrong. If there is a native call inbetween two JS calls on the stack, the call stack will be unwound to the point of the native call frame, and throwException will return. After the native (C) call frame has been unwound, throwException will be called again to unwind remaining JS call frames, and so on. This was causing QtScript to discard the backtrace belonging to the inner-most JS frames; the backtrace would be regenerated from a partially unwound state. Fix this by ignoring subsequent calls to the uncaughtException() callback once a backtrace has been captured; the backtrace is already cleared before each evaluation is started. Task-number: QTBUG-26889 Change-Id: I03e1d60fbac5e592cff1dd5ef70f397cf94454ae Reviewed-by: Simon Hausmann <[email protected]>
* Remove the use of the QWidgetStar metatypeid.Stephen Kelly2012-08-152-12/+7
| | | | | | | | | | It is to be removed, and is obsoleted by QMetaType::PointerToQObject. By using QMetaType::PointerToQObject, we also gain the feature that all pointers to types derived from QObject return true for QScriptValue::isQObject(). Change-Id: I18392b5b6cde3a45d060c37612d987a5cf8e8f18 Reviewed-by: Olivier Goffart <[email protected]>
* Make QScriptEngine::uncaughtExceptionBacktrace() work againKent Hansen2012-08-156-21/+83
| | | | | | | | | | | This function has been broken since Qt 4.6 (when the JavaScriptCore- based back-end was introduced). Fix it by introducing a callback in JSC that allows us to capture the stack when an uncaught exception occurs. Task-number: QTBUG-6139 Change-Id: I4a829323c9fb0c8b2f16a2e5d6f0aeb13cc32561 Reviewed-by: Olivier Goffart <[email protected]>
* Add default conversion for types long and ulongKent Hansen2012-08-142-0/+30
| | | | | | | | | | | | | | Such conversion is not guaranteed to be lossless on all platforms, but it's still reasonable to support these types by default. JSC::JSValue already had constructors for them. The type matching / overload resolution in the QObject binding already handled long and ulong, but the value conversion itself was missing, for some reason. Task-number: QTBUG-2124 Change-Id: I14ff29a8e949403234b7659c0aca8b48bcdbda0e Reviewed-by: Olivier Goffart <[email protected]>
* Suppress JavaScriptCore 'LEAK' messages at application exitKent Hansen2012-08-132-0/+5
| | | | | | | | | | | | | | | | | | In debug mode, if a QScriptEngine was never destroyed, JavaScriptCore would output a message like LEAK: 120 Structure on stderr at exit. This is not terribly helpful to users; also, it's not common for Qt classes to produce such output. Since JavaScriptCore's only usage of the logging facility is for reporting these "leaks", we can disable logging altogether. Task-number: QTBUG-18201 Change-Id: Id598bd1f48129d821a954cc49d8e3ab715d78426 Reviewed-by: Simon Hausmann <[email protected]> Reviewed-by: Olivier Goffart <[email protected]>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-111-3/+1
| | | | | Change-Id: I05b18befb71ef0483ee5a40dab6163f0612782e0 Reviewed-by: Joerg Bornemann <[email protected]>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-112-2/+2
| | | | | Change-Id: Ied05f26ee735d63a89a5bcf9b7afbeaa8e70809c Reviewed-by: Joerg Bornemann <[email protected]>
* Fix GC issues related to QObject connections and ownershipKent Hansen2012-08-094-38/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 1: Even if a sender object was only weakly referenced, the connection's slot function would still get marked. If the slot was a closure, its scope could hold a reference to the sender object, so by marking the closure, the sender would get marked, too - even if there were no other references to the closure outside of the QObject connection structure. This would cause the sender object to stay alive, rather than being garbage-collected (i.e., it leaked). Issue 2: It's possible that a closure used as a slot in a connection for one QObject holds the only reference to another QObject that has connections of its own. In that case, if the first object is explicitly referenced, the second object (and its connections) should get marked. But depending on the order in which the connections were marked, the second object might get treated incorrectly. This commit solves both issues by introducing an iterative scheme for marking connections. The first pass marks only connections whose sender object is referenced elsewhere in the JS environment. The second pass marks connections whose sender object is referenced by slots of the connections marked in the first pass. And so on, until no more connections should be marked. At that point, any remaining unmarked connections are effectively dead (belonging to QObjects that can be reclaimed by the GC). Task-number: QTBUG-26590 Change-Id: I50aa66f7fe407a6827b6f2a12e027275a2fb4655 Reviewed-by: Simon Hausmann <[email protected]>
* Add qtscriptglobal.h for the qtscript.git module EXPORT macrosThiago Macieira2012-08-0910-1/+80
| | | | | | | | No library other than the core libraries should depend on their export macros being in qglobal.h. Change-Id: I6ded70813f6296ca5aa1d7d3cdb38503a5538424 Reviewed-by: Kent Hansen <[email protected]>
* QScriptEngine::pushContext(): Don't inherit parent context's scopeKent Hansen2012-08-083-22/+9
| | | | | | | | | | | | | | This was a regression introduced in Qt 4.6 (JavaScriptCore-based backend). pushContext() should always create a context with a "clean" scope (only the Global Object and the context's own activation object should be in the scope chain). The scope chain API is internal, but the wrong behavior could still be observed e.g. through QScriptEngine::evaluate(). Task-number: QTBUG-18188 Change-Id: I138dabc665d7275fb85d3b5e1b473d56096a989e Reviewed-by: Olivier Goffart <[email protected]>
* Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)Kent Hansen2012-08-068-39/+84
| | | | | | | | | Cherry-picked from webkit commit a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 Task-number: QTBUG-23871 Change-Id: Ia028fe072b349e3a7883ae0f6f7298941cc1bc9e Reviewed-by: Simon Hausmann <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-21 06:09:28 +0000