| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The missing flush could result in script bindings appearing after the
closing brace of an object.
Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(backported from e01219b77b1e889e70437635905d7ff820568e23)
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-6625
Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(backported from 409aecbe1e30aa1319ea72bf830c405827e13d21)
|
|
|
|
|
| |
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
|
|
|
|
| |
Task-number: QTCREATORBUG-5825
|
|
|
|
|
|
|
|
|
|
| |
Previously, the import statement was not necessarily set up correctly
for the type we wanted to instantiate. We simply use
QDeclarativeType::create now and thus can skip finding the right import.
Mirrors qtcreator/f326bd067d455e979b5d83195e19581a9e2fd494
Reviewed-by: Roberto Raggi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the current working directory was a direct parent of the qmldir path
the exported modules had the path as the module URI on macs.
Also changes the QtQuick export back to 1.0 to make it work with
Qt 4.7.3. The version of that import statement does not actually matter
as long as it's valid.
Mirrors a change in Qt Creator:
http://codereview.qt.nokia.com/896
Reviewed-by: Kai Koehne
|
|
|
|
|
|
|
|
| |
Mirrors
6244008dcb43dde15dea3becbbec07d941b4759c
in Qt Creator/2.3.
Reviewed-by: Kai Koehne
|
|
|
|
|
|
|
|
|
| |
Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.
Mirrors http://codereview.qt.nokia.com/759
Reviewed-by: kkoehne
|
|
|
|
| |
Reviewed-by: Kai Koehne
|
|
|
|
| |
Done-with: owolff
|
|
|
|
| |
Reviewed-by: Kai Koehne
|
|
|
|
|
|
| |
Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1.
Reviewed-by: Kai Koehne
|
|
|
|
|
|
|
| |
Mirrors a change to qmlplugindump in
qtcreator/715cee76a9e46efb7f8245004aaa8a1c47b1618d
Reviewed-by: Kai Koehne
|
|
|
|
|
|
|
| |
Mirrors a change to qmldump in
qt-creator/6e3274240077fc356a37d3de735b3b2da9654d2e
Reviewed-by: Roberto Raggi
|
|
|
|
|
|
|
|
|
|
|
| |
Since we can't import by such a path, we instead use a "." import
and set the uri of the component to the correct path.
Mirrors a change to qmldump in
qt-creator/0c8b4e38fab1862e3427aac7e7db68623bc7f174
Reviewed-by: Thomas Hartmann
(cherry picked from commit 3904e604f453b43b2a0e45a882283e26a27eaa18)
|
|
|
|
|
|
| |
New files after merged from qt/4.8
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Keep the old -- options for compatibility.
Change-Id: I9c9b0beccc7043cf8b4b654bdba33946abf8c7b6
Task-number: QTBUG-18834
(cherry picked from commit 175382d834142f2a55b4e209af870ab40f741d2d)
|
|
|
|
|
|
|
|
| |
This migrates b980a9b9646a89b5b24efeca40926408a71334de from the
Qt Creator's copy into the qmlplugindump in Qt.
Change-Id: I1ab90f491f5df0e6570aa43a91073e7b332e41df
(cherry picked from commit 9fcece7b455b6540a67780cc3874b230e586b7c4)
|
|
Also rename it to qmlplugindump.
Qmlplugindump is a tool that loads a QML module and prints type
information about the types contained in its plugins to the standard
output.
Reviewed-by: Aaron Kennedy
Change-Id: I7c35c34af23adc1c37453393d71e492dedfc6a9b
(cherry picked from b5265d4e99e5c90532e190632951070cf1a2b630)
|