summaryrefslogtreecommitdiff
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
View Lorry Controller Status