summaryrefslogtreecommitdiffstats
path: root/src/scripttools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-031-1/+1
|\ | | | | | | Change-Id: I37ffab5c5cf7c0898e1fa2b291cb7d95120fa25e
| * Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-021-1/+1
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I10d928ac4368e07a52a92ef92bf501ba28d9b667 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-3014-15/+15
|\| | | | | | | Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5
| * Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-2614-15/+15
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I772c028967f3c986674081992f569bd7bbba81a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-191-0/+2
|\| | | | | | | Change-Id: Ie112fce6a13098f0baee5f06d4dbeafb0daca2e1
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Qt Forward Merge Bot2019-10-121-0/+2
| |\ | | | | | | | | | Change-Id: Ib3471490e7ddb8d7adaf81245d45cd1f8ec178f0
| | * Fix build with -no-feature-tooltipJoerg Bornemann2019-10-091-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-79048 Change-Id: I287c580785b8b22c877e7a6b885402fbe1bff249 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-044-7/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5568b3f8f2834f30e3ffa43f50c2f47ac9b66036
| * | Bump Qt version to Qt 6Alexandru Croitor2019-07-114-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | And also fix usages of removed API. Change-Id: Ifbbe08a202ed19b5969781f66240174ef816269e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Remove usages of deprecated APIsSona Kurazyan2019-08-2312-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced: QLayout::setMargin -> QLayout::setContentsMargins Qt::ItemDataRole::TextColorRole -> Qt::ItemDataRole::ForegroundRole Change-Id: I3bae804d593835f1bc96a8c654fcfa77106bc91c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devEdward Welbourne2019-07-111-0/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: .qmake.conf Change-Id: I64aacde81bbfde91037b5c4d88c5ac8daba8f5f4
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I92a9d8aba6396ddd77e04450760e03cadbd8c46a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-122-3/+3
|/ | | | | Change-Id: I19b6f439aa475c32cfe90e67adba93127e476d6e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Doc: Remove unnecessary \fn commandsTopi Reinio2019-02-136-12/+0
| | | | | | | | | These are not required as the documentation is already adjacent to the correct function body. The \fn commands also caused some warnings in the form of clang diagnostic messages. Change-Id: I3fcce59b9e523fc8969dc6ef0440477886da8df7 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Fix some deprecation warningsv5.13.0-alpha1Friedemann Kleint2019-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | debugging/qscriptedit.cpp:286:39: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] debugging/qscriptedit.cpp:309:48: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:309:48: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:315:49: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:315:49: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:318:45: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:318:45: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] tst_qscriptvalue.cpp:1270:45: warning: ‘T qVariantValue(const QVariant&) [with T = QObject*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:343:64: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QLineEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:345:75: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QPlainTextEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:354:88: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QPlainTextEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:836:33: warning: ignoring return value of ‘bool QTest::qWaitForWindowExposed(QWidget*, int)’, declared with attribute nodiscard [-Wunused-result] context2d.cpp:473:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:486:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:500:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:627:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] tetrixboard.cpp:104:76: warning: ‘const QBrush& QPalette::background() const’ is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] tetrixboard.cpp:130:33: warning: ‘QColor QColor::light(int) const’ is deprecated: Use QColor::lighter() instead [-Wdeprecated-declarations] tetrixboard.cpp:134:32: warning: ‘QColor QColor::dark(int) const’ is deprecated: Use QColor::darker() instead [-Wdeprecated-declarations] Change-Id: I795c140c476541bba9c653effdcda0a50cbe9acd Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Document licensesKai Koehne2018-06-191-0/+9
| | | | | Change-Id: Iff237d048ead8e525ef79727fcaabb3043e8db65 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Fix documentation warningsv5.11.0-beta4Topi Reinio2018-04-133-19/+18
| | | | | | | | | | | Use complete function signatures for \fn commands (including template specifiers) as Clang parser now reads them. Convert internal class documentation comments to standard C-style comments. Change-Id: Ie67eb054171139db12f7e74d077b7dc8453582df Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-18142-1988/+2840
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I77f29cac3182808e0b9601f3415c9740b8f0fa88
| * Fix license headersJani Heikkinen2018-01-15142-1988/+2840
| | | | | | | | | | | | | | | | | | | | old header.LGPL21 was used in some src and test files. Replace ones in src/ with correct header.LGPL one and ones in tests/ with correct header.GLP-EXCEPT one. Also add correct license files and remove unnecessary ones Change-Id: Ifc7bb0f25bd9df652ddafe0faceaebd52b495bef Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-186-22/+62
|\| | | | | | | Change-Id: Idebaee1835329337ee03e27e9499b951a5cdb907
| * Fix outdated BSD license headerKai Koehne2017-10-174-12/+52
| | | | | | | | | | Change-Id: I191edb211ed6cffce17b0a5b7656691ce41b754c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-172-10/+10
| | | | | | | | | | Change-Id: I8e2e863f4a9f05b577f63a233654785a6d294387 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-3/+3
|/ | | | | Change-Id: I9b2a6ce4a0278520fd95042a1b2736cc5a0d4be6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove uses of QString::nullMarc Mutz2017-03-101-16/+16
| | | | | | | It's going to be deprecated. Change-Id: I8c126427c8d888a7d0c8bf12a5a5aade31cb6afd Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Port to new feature systemFriedemann Kleint2016-12-021-3/+0
| | | | | | | | | Build tools depending on feature 'textedit'. Fix warnings qtscript/src/scripttools/scripttools.pro:1: Cannot find feature qfeatures Change-Id: I96b403668164c4821cdebf1b13043e9f92c129ea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix usage of deprecated QStyleOptionViewItemV3v5.6.2Joerg Bornemann2016-07-051-9/+1
| | | | | Change-Id: Ie8223958c2e281bd00bacf80c22cc3f7282b42db Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Purge sRGB chunks from PNGs.Edward Welbourne2016-03-315-0/+0
| | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce (A couple of them needed -force, but did get smaller.) Change-Id: I216fe2a8163fab11f8b8e8ca0fa92c00a94d68bf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Make more ctors explicitMarc Mutz2016-03-061-1/+1
| | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. One is even a protected ctor. Change-Id: I114b26332ba0e2752f5d02ebcd6090fc2b562b40 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-061-3/+3
| | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I7e007ee907c479320a885af329745563c080467d Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I0cb70c7954b4f23778279d9c6bd8c558b6825d98 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fixed license headersJani Heikkinen2015-02-174-12/+12
| | | | | Change-Id: I99e62a707fe649403214436a4b9aad8fd82015ee Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-133-11/+4
|\ | | | | | | Change-Id: Ic32f5bd17782285305aaa01694f1a78851b882eb
| * Doc: Moved the example documentation to correct locationsNico Vertriest2015-01-193-11/+4
| | | | | | | | | | | | | | | | | | | | And fix the \snippet commands to use the correct paths. Also edited dependencies qdocconf files Task-number: QTBUG-43810 Change-Id: I3c2fb6d2a48900a9b5651225381707c9ec25065a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update copyright headersJani Heikkinen2015-02-12148-1026/+1026
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Iffc10aac2cdaf7c7ceba051ec447f15758c3d8e0 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Replace Q_STATIC_GLOBAL_OPERATOR with its expansionThiago Macieira2015-01-071-3/+2
|/ | | | | | | | This existed to work around compiler bugs with RVCT. Let's assume anyone still using RVCT is using a newer version. Change-Id: Ic1c1a8b13e0e1d4393c701a6c308df37e80da555 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-141-0/+3
|\ | | | | | | | | | | | | Conflicts: src/script/script.pro Change-Id: Id2abbacef830a9b553c269af907e12f2c10f8b40
| * build with QT_NO_TEXTEDITJoerg Bornemann2014-09-171-0/+3
| | | | | | | | | | Change-Id: I0c7ee38cf12de991e23c7259e65f2eaa7c8f7045 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-24142-2698/+1562
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I8b229a6405aefe7951ad0d13d6432d01a4ec8263 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
|/ | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I6a09e5862558629338da4bc8332e532d77de7d49 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-0/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I77ed98ade58cdd4c6f5c365682993f1be3f3e958 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Fix tab-completion for variables that have digits in themAndy Shaw2013-10-221-1/+1
| | | | | | | | | In the QtScript Debugger if a variable had a number in it then it would not tab complete to show the member variables. This accounts for digits so that it is correctly able to find the variable to complete on. Change-Id: I4fe0b3b776aba0e3caa6dd524c1a0c59421ea515 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Remove QtAlgorithms usage from QtScript.Friedemann Kleint2013-09-265-6/+18
| | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: If4dc8f69fd75315390a4850be732715064f5fdd8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-021-0/+1
| | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I018b00a19c3bbd2aa4bf34712f414569dd50775b Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Setting navigation variables for Qt Script and Qt Script ToolsJerome Pasion2013-06-261-1/+4
| | | | | | | -also enabled linking to 'qtdoc' for the homepage link Change-Id: I74781effabac4c73c8a286347e5aa0821d5931f0 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fix module names in .qdocconfTopi Reinio2013-04-261-11/+11
| | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: If9f79e73d823270d8ecb652d1b7b9d9d44f9562e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-2/+2
|\ | | | | | | Change-Id: I25b38558ad6515197114831b43a756d4edce6ee9
| * 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>
* | Fix CLANG-warnings.Friedemann Kleint2013-03-082-3/+2
| | | | | | | | | | | | | | | | | | | | - Unused member variable. - Unused static functions. - Return false for pointer. Change-Id: Ie78332d3754e7f53ed75d6006c11d60c29719c7b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-059-8/+404
|\| | | | | | | Change-Id: Ib100dac4eccddf7a72382b7d1ead7d504a572347
| * Merge branch 'release' into stableSergio Ahumada2013-01-319-7/+403
| |\ | | | | | | | | | Change-Id: If3a1efe3888b872702d75e25d1943ff79d57e9c6