summaryrefslogtreecommitdiffstats
path: root/tools/qml
Commit message (Collapse)AuthorAgeFilesLines
* QRegExp include cleanupSamuel Gaist2017-03-261-0/+1
| | | | | | | | This patch adds missing include statement where the QRegExp class is used. Change-Id: I059825d8d3a9b97775d88f429d7e45564c0b44f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update copyright headersAntti Kokko2015-02-2316-112/+112
| | | | | | | | | 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: I9e68d256991ef7325c29c38ce9c007506ce6b150 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2516-304/+176
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* whitespace fixesOswald Buddenhagen2014-02-201-1/+1
| | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove stale phonon referenceOswald Buddenhagen2013-09-301-3/+0
| | | | | | Change-Id: I0ab1c16d2a9b593782f846ac11374ff9727d72c1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix organization domains.Friedemann Kleint2013-07-151-2/+2
| | | | | | Task-number: QTBUG-32390 Change-Id: Ibaeb0b1ad2ee7b446252fc5e5984c78dbb909a3f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* make use of qt_app.prfOswald Buddenhagen2013-05-281-5/+2
| | | | | Change-Id: Ibb906772daf7a6bc6d56874db0a4ced2cafa67a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix warning about overloaded virtual in qmlviewer (CLANG).Friedemann Kleint2013-03-112-2/+2
| | | | | Change-Id: Id5f3f66a353a360e98957541e339a28ad0d301e5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-282-4/+4
| | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1016-16/+16
| | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QmlViewer: Fix test script exits.Friedemann Kleint2012-12-201-5/+19
| | | | | | | | | | | Use exit code 1 on Windows to indicate failures as negative exit codes are reported as crashes by QProcess in the qmlvisual test. Always use QCoreApplication::exit() to ensure proper cleanup. Task-number: QTBUG-28611 Task-number: QTBUG-28735 Change-Id: I0b12153449f7371ce7795a5747e3311184bc7b6f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlViewer: Display options on Windows using a non-proportional font.Friedemann Kleint2012-12-201-1/+3
| | | | | Change-Id: I7006fdc73c459da0e19e08fbda35905f32f2aebc Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-191-1/+1
| | | | | | | qt is already added by spec_pre.prf. Change-Id: Ie2cf7c733718319437a823993c09778507c423ef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Adapt to WebKit module changesSimon Hausmann2012-10-191-2/+2
| | | | | | | | QtQuick1 uses the Widgets related API of QtWebKit and hence needs to use the QtWebKitWidgets module. Change-Id: Idf2e65d053e1dbf2501486c8f0a22b8b25f23efc Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* QtQuick1: Make the examples test for QtQuick1 pass.Friedemann Kleint2012-10-172-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | - Fix check to indicate immediate errors, skip the loading state and check for errors after loading again. - Exclude all broken examples. - Exclude Mac .app folders - Fix the DeclarativeViewer to check for the presence of the ImageMagick and ffmpeg executables only once, reducing test time. - Do not check for ImageMagick by running its command line tool 'convert' on Windows, since Windows has a tool of the same name that converts file systems (!). - Fix doc snippets to load correctly. - Introduce defines in case WebKit or XmlPatterns are not present (which existed in Qt 4). Task-number: QTQAINFRA-428 Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtQuick1: Fix qmlviewer no longer showing file dialog.Friedemann Kleint2012-10-171-6/+4
| | | | | Change-Id: I81588fbe7141fb1df0d56b2dec2e8d495af975a0 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-172-3/+3
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2416-384/+384
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Use qInstallMessageHandlerKai Koehne2012-09-141-9/+7
| | | | | | | qInstallMsgHandler got deprecated in Qt 5. Change-Id: I87f5f8d5b28afcbcf8a9c613d1d4b1199f5f4254 Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
* Use CONFIG+=quick1_debug in pro files to activate debuggingv5.0.0-beta1Kai Koehne2012-08-241-1/+1
| | | | | Change-Id: I63cc45662e8f1ac5979ac8cf2ba8c76b42c45895 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Use Qt::WindowFlags, not Qt::WFlags.Stephen Kelly2012-08-201-1/+1
| | | | | | | | | The latter seems to date from the Qt 1 days, and such abbreviations are not current Qt style. Change-Id: I6384d32f125fe7800c57e387f48930a1e71fbe08 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make qtquick1 compile with QT_NO_DRAGANDDROPTasuku Suzuki2012-06-281-0/+4
| | | | | | Change-Id: Ic7790b074a138371e28f1be487c2d05c98242134 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
* Replace QWeakPointer with QPointer for tracking QObjectsThiago Macieira2012-06-261-1/+2
| | | | | | | | | | | QWeakPointer support for assigning QObjects is deprecated. Use QPointer instead. This is required to compile with the deprecated API disabled. Change-Id: I5b5c9b261d66c297b57889ce072f4bdf98613e36 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Detect, and disallow qtquick2 in qmlviewer.Robin Burchell2012-06-251-10/+62
| | | | | | | Try to automatically fall back to qmlscene, print an error if not possible. Change-Id: I55e7bafe3477bf75d72709fe8a98746b5d9e6442 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Strip out Maemo5 code.Robin Burchell2012-06-196-323/+2
| | | | | Change-Id: Ia4315c32ba35f9ec7bd7b4e935bfcdbc21c1410d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove Symbian support.Robin Burchell2012-06-197-287/+1
| | | | | Change-Id: I735584db5cf7298ef61f316036df460e79485246 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Updates to platform-specific code for Qt 5.Robin Burchell2012-06-181-17/+2
| | | | | Change-Id: I69d237e28303e4d9b6bb57d97e84fb5dae1f4e48 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Do not let QML warnings reduce the frame rate in fullscreen mode.Andreas Hartmetz2012-05-292-0/+9
| | | | | | | | | | | QPlainTextEdit::appendPlainText() can take surprisingly long, even when the widget is hidden. In a demo on embedded hardware we've seen the frame time go up from ~55 milliseconds to ~85 over the first few minutes of the demo running. There was one warning emitted per frame. With this patch there is no significant performance degradation. Change-Id: Ic80409b29a1544f03431e1573811a00925660338 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-042-8/+8
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I657ca349b700fa043a796b7a464d057ca18bb90a Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QImage::numBytes() is deprecated in favour of QImage::byteCount()Thiago Macieira2012-05-041-2/+2
| | | | | Change-Id: Iff87ba1a658683bcef3a38353602a733f18a1340 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Use the declarative_debug config option to enable debug.Andrew den Exter2012-02-221-1/+1
| | | | | | | | | | There doesn't appear to be any straightforward way to install additional prf files to qtbase and declarative_debug.prf is identical to quick1_debug and already present in the qtbase repo. Change-Id: I8332e22f4039c7de18fedb21fe951ff19611ea13 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix compilation on HarmattanSimon Hausmann2012-02-151-11/+11
| | | | | | | | | Yeah, this seems strange, perhaps the code should be removed altogether. But this fix is simple to compensate for the fact that the code is compiled with NO_CAST_FROM_ASCII. Change-Id: I35dc093b05e7de4df757464869b5aa4609d74977 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix license header format.Matthew Vogt2012-02-0718-36/+18
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-0718-0/+18
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Install binaries and imports to qtbase.Andrew den Exter2012-02-031-6/+2
| | | | | | | Use the Qt.quick1.* variables to determine the DESTDIR. Change-Id: I17b6d1f037b76ed25a005ec56cbc5c82b522ffc6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix compile failures.Andrew den Exter2012-01-311-0/+1
| | | | | | | | Remove uses of QLineControl, QTextControl and QBool and forward declared QGraphicsWidget. Change-Id: Ic5184a1d5aebfb1100ad0e24444b6773f4e617e8 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-313-2/+3
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-3041-0/+6316
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6