summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into old/5.0old/5.0Oswald Buddenhagen2013-04-113-3/+28
|\ | | | | | | Change-Id: I72d37aa6e543c0c93ea3bb743361b3e4938358fe
| * substitute fixed version numbers in qdocconf files with variablesv5.0.2Sergio Ahumada2013-03-261-2/+2
| | | | | | | | | | | | | | Also fix the index title Change-Id: I2bbc581a7095d4d347a4622e2ce16ca7e5e447e5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | Change-Id: If9bd35e1a66c3a18f2cc826a47177611e1f8b4d3 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Test the cmake scripttools module only if widgets is available.Stephen Kelly2013-03-141-2/+11
| | | | | | | | | | | | Change-Id: Ia124db1328e9d6b87c9b1b6858103f81e1678355 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
|\ \ | |/ | | | | Change-Id: Ic66e2b3a22797132c61a155f8574695416e1203b
| * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I3b751565b50c12c5bcd2fab293e8fc9092b1c10b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Merge branch 'stable' into releaseOswald Buddenhagen2013-02-20350-102884/+9145
| |\ | | | | | | | | | Change-Id: I7178c6375a3c2a555d9eb88922082d3af22a3f20
* | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: I778e3ca6a5f3f316948c652f4f30f00ebbf900cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Fix a typo in QScript example.Jędrzej Nowacki2013-02-261-1/+1
| |/ |/| | | | | | | | | | | | | | | | | LoadScript function should iterate over arguments and load all scripts not only the first one. Task-number: QTBUG-28805 Change-Id: I03c6764946cfb403ff5af818bfc45b41524ad5c6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-154-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I85480f9336a975e77866a95c12801259f5ee83a9 Reviewed-by: Jason McDonald <macadder1@gmail.com>
* | Remove QPointerBase bic check.Stephen Kelly2013-02-132-10/+0
| | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: I84f8708a06f4c4495a073b3bde02015b263403cf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-1/+1
| | | | | | | | | | Change-Id: I9091efd330ce903d2f78d7ecf0ca718a001a00df Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge branch 'release' into stableSergio Ahumada2013-01-3115-26/+263
|\ \ | |/ | | | | Change-Id: If3a1efe3888b872702d75e25d1943ff79d57e9c6
| * Fix QtScript crash on 64bit with JIT.v5.0.1Friedemann Kleint2013-01-282-4/+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: Simon.Hausmann@digia.com Task-number: QTCREATORBUG-8629 Task-number: QTBUG-23463 Change-Id: I0efadd5ed20855409122e1fcc9236fdfbc4f62a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Doc: Modularized Qt Script Tools documentation.Jerome Pasion2013-01-2413-16/+260
| | | | | | | | | | | | | | | | | | | | | | | | -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 <jedrzej.nowacki@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Update changes file for 5.0.1 releaseSergio Ahumada2013-01-211-5/+1
| | | | | | | | | | | | Change-Id: I575ab7319e3ef9d19da9b83aef15bf8e5f50dbd5 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | Change-Id: I7f7eec61e442831b82aed579dd1526a12ebd71c8 Reviewed-by: hjk <qthjk@ovi.com>
| * Merge branch 'stable' into releaseSergio Ahumada2013-01-092-0/+54
| |\ | | | | | | | | | Change-Id: I3b72b66e4b65573c8390e13bece09b638b4ae279
| * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I0e26b6a8749848b1ed52d99ea0be8566527ecb15 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Doc: Fix module name formatSze Howe Koh2013-01-2623-108/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <jerome.pasion@digia.com>
* | | tst_bic: Add linux-gcc-ia32 bic dataSergio Ahumada2013-01-143-1/+7034
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding bic data for the following modules: - QtScript - QtScriptTools Change-Id: Ie16f2aa9f399d3f05facbc9cfa2de2a0797f0962 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | Remove the Qt 4 BIC data for QtScript.Sergio Ahumada2013-01-1413-102442/+0
| | | | | | | | | | | | | | | | | | | | | We will not be testing BIC of Qt5 against Qt4 Change-Id: I649d0a7f9f628211d73b6ce740220e9ce116c52f Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | 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 <jedrzej.nowacki@digia.com>
* | | Update copyright year in Digia's license headersSergio Ahumada2013-01-10313-315/+315
| | | | | | | | | | | | | | | | | | Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | make use of qtHaveModule()Oswald Buddenhagen2013-01-108-10/+10
| | | | | | | | | | | | | | | | | | | | | Change-Id: I440b609d23570293f21f21a2cb31854366d06bf7 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | 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 <simon.hausmann@digia.com>
* | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
| | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: I64b83c828e0bdcfdac931776ca6af3da5542186d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
|/ | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I33d3b5bbb78810cf0f57cf02e21e67da95c55299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove obsolete DEPENDPATH assignmentsv5.0.0Oswald Buddenhagen2012-12-164-4/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I0804385b636d6f5b3b0136cc472a1f9ecb7b7871 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* 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 <joerg.bornemann@digia.com>
* make use of qt_headersclean.prfv5.0.0-rc2Oswald Buddenhagen2012-12-122-73/+2
| | | | | Change-Id: I0256b34290c3f281ab51141d84795f3514cb832d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* purge ce-compat referencesOswald Buddenhagen2012-12-123-2/+28
| | | | | | | | adapted from WebKit changes 125004 & 125018. Change-Id: Id051375924ece634acf2c0564a39c2d4b1cebe3c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* 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 <oswald.buddenhagen@digia.com>
* Doc: Replace outdated macroChristian Stenger2012-12-071-2/+2
| | | | | Change-Id: I7750e9af3eee8cee5be202094acd1d3efc4b52b0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* centralize and fixup example sources install targetsv5.0.0-rc1Joerg Bornemann2012-12-0511-59/+44
| | | | | | | | This follows suit with aeb036e in qtbase. Change-Id: I695c3f7c69cfe811ffe05f7cb381e3216b76e7a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-12-058-8/+8
| | | | | Change-Id: I70a3156710a37b02417c7d6c7c6c1ee222da0281 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtScript: Fix link to Qt Linguist Manual.David Schulz2012-12-042-2/+2
| | | | | Change-Id: I543eee28fa1f72d2b9371b39906fd3f0219cc000 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-1/+1
| | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: Ie7e29bea0648a3e3b106951615ba05ec4beefb0e Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* remove symbian vestigesOswald Buddenhagen2012-12-0419-84/+7
| | | | | Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* 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 <kai.koehne@digia.com>
* Fix up the Qt Script docsLars Knoll2012-11-293-92/+48
| | | | | Change-Id: I20e6d2fca4faef1586b5da3ff494fb8196645f34 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Change copyright holder from Nokia to DigiaSergio Ahumada2012-11-271-1/+1
| | | | | Change-Id: I3a9c2dbe0262d5139314b7447adce8bbb599f9b8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* 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 <jedrzej.nowacki@digia.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Always get the default flags from QAIM.Stephen Kelly2012-11-272-2/+2
| | | | | Change-Id: I9171bce02bc1cd0973fee43af1774f887b4f8668 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix scriptdebugger exampleChristian Stenger2012-11-271-1/+2
| | | | | | Task-number: QTBUG-28128 Change-Id: Ifb57fa5e5dc2fa1959e8f04861897f59d3ce635d Reviewed-by: hjk <qthjk@ovi.com>
* Compile fix for example after changes to QApplication constructorAndy Shaw2012-11-242-10/+2
| | | | | | | | As QCoreApplication::Type is no longer public then change this to use QCoreApplication instead as the example does not need a GUI application. Change-Id: I24f98ec6538fc3f4bfc8612defbb6e7bb4dbf9aa Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix build of installed examples.Friedemann Kleint2012-11-211-1/+1
| | | | | | Task-number: QTBUG-27977 Change-Id: I26a85995367d79c0a88f3e8a6e8a4fc15caf9094 Reviewed-by: hjk <qthjk@ovi.com>
* 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 <martin.smith@digia.com>
* | autotests were moved to qtbase as they have no real script dependencyOliver Wolff2012-11-0827-3012/+0
| | | | | | | | | | | | | | | | Task-number: QTBUG-27705 Task-number: QTBUG-27706 Change-Id: I1bd17444b5ba8effba52bf4c179751f25a9d5974 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
View Lorry Controller Status