summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-021-1/+0
| | | | | Change-Id: I875fb9563af10f51bb3d51950bc376f44a8f38db Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-022-14/+4
| | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. some other setup can be skipped as well. Change-Id: If6e77a42a571e1977875b13bc8519a2cd43df16a 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-176-12/+12
| | | | | | | | | | | | | | | | | 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-2421-504/+504
| | | | | | | | | 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>
* qmlplugindump: Update help outputKai Koehne2012-09-181-1/+1
| | | | | | | We dropped the 4.7 import a while ago. Change-Id: I8ae8d11b890374c3ec6e87556a7de1f064d37f38 Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Compile & install qmlplugindump by default (again)Kai Koehne2012-09-172-27/+5
| | | | | | | | | qmlplugindump is still needed for QtQUick1 modules, since the one in qtdeclarative will choke on the QtQuick1 dependency. Therefore revive qmlplugindump in here, but name it qml1plugindump. Change-Id: I975621cff4758ab71e165eb3f6398d70a1f154be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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>
* qmlplugindump: Fix compilation againKai Koehne2012-09-101-24/+18
| | | | | | | Apply changes done to qtdeclarative/qmlplugindump here, too. Change-Id: I55c99fb0ad499c5cb59dda33e320702c0d4722ea Reviewed-by: Christian Kamm <christian.d.kamm@nokia.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>
* don't reference $$QT_BUILD_TREE - it's unavailable hereOswald Buddenhagen2012-06-261-1/+1
| | | | | Change-Id: I6afbab3b3cc721eb84abf030ab703c0f0366dcbc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.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>
* Remove the remaining traces of the old plugin systemLars Knoll2012-06-052-2/+1
| | | | | Change-Id: I0b4156f01d5d1bfe5cdde724148ed681025ab227 Reviewed-by: Lars Knoll <lars.knoll@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>
* Eliminated usage of "declarative" compat module.Rohan McGovern2012-05-151-1/+1
| | | | | | | | | | | | | | | | The check in qmltooling attempts to avoid installing the qtquick1 version of the debugger plugin if qtquick2 is used. The removal of the declarative module meant that this plugin was always enabled, potentially overwriting the qtquick2 debugger plugin. This check was updated to work again, although this approach is still somewhat problematic. It would be better if the different versions of the plugins had different names. The check in tools/designer/src/plugins doesn't seem to make sense, so it was removed. Change-Id: I55d1bf59264d3c5d62c2d4545e9ced952e460efb Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-043-10/+10
| | | | | | | | | | 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-0720-40/+20
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-0720-0/+20
| | | | | | | | 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>
* Add qmlplugindump tool to qtquick1 moduleMatthew Vogt2012-02-025-0/+1094
| | | | | Change-Id: I94a52b2207fb2b5dd66e9e4da8f42ddf2daf4da0 Reviewed-by: Andrew den Exter <andrew.den-exter@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-317-9/+7
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-3046-0/+6553
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 01:50:36 +0000