| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
doc/src/external-resources.qdoc
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
Skip flick velocity test on Mac.
Try again to fix flickable velocity on Mac.
Try to fix Mac CI test failure
qmlplugindump: Fix dumping with -path on Mac.
qmlplugindump: Improve error message for misbehaving plugin components.
Flickable is too sensitive.
Reduce timing dependancy in flickable test
Velocities reported by Flickable in onFlickStarted can be 0
qmldump: Fix export comparison.
QmlInspector: Some code cleanups
QmlInspector: Some cleanup in the Color Picker tool
QmlInspector: Unified mouse and keyboard event handling
QmlInspector: Removed private header postfix and Qt namespace
QmlInspector: Share code between QGV/SG based QML debugging
qmlplugindump: For extended types, remove exports of the base object.
qmlplugindump: Build debug version if possible.
QDeclarativeDebug: Add code coverage information
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fixing winscw def file broken by recent merge
runonphone: Change the upload option to allow uploading any file
runonphone: Include the manufacturer name in the friendly name on OS X
runonphone: Fix usb device enumeration on Mac OS X
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allows uploading of any file to any directory on the phone.
Merge-request: 1271
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This helps automatic detection of devices such as N8-00, that don't
include Nokia in the product name (while devices from earlier
generations did include it, such as "Nokia 5800 XpressMusic").
Merge-request: 2633
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The change in 763f3acd879648648465475aef773fe0876934a9,
when merged in a315c693d0f3dd64711b8459d86b89ddc48e8c1a,
broke the usb device enumeration on OS X.
This commit makes it work again, but now we look for two
/dev entries per device (although only one of them exists).
If many usb devices are connected, this increases the risk
for false matches - if that ever happens, the
iteration/checking that was removed in
763f3acd879648648465475aef773fe0876934a9 could be readded
within the #ifdef Q_OS_MAC, making it add only one regexp
per device again.
Merge-request: 2633
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits)
Make sure the declarative plugin of QtWebKit is build once.
Make sure JavaScriptCore is build once.
Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
2011-05-23 Matthew Delaney <mdelaney@apple.com>
Fix headers generation for QtWebKit.
2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.
Fix the auto-tests of QtWebKit.
2011-06-27 Joe Wild <joseph.wild@nokia.com>
2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b
Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90
Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114
Make QtWebKit actually works when linked to an application.
Attempt to get Symbian building with SQLite.
Make the headers test pass by including QtGui/QColor instead of QColor.
Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG.
Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.
Use WTF::notFound instead of -1 to check for Vector::find() errors.
The autotests don't even build on Symbian, skip them for now.
...
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (39 commits)
Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
2011-05-23 Matthew Delaney <mdelaney@apple.com>
Fix headers generation for QtWebKit.
2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.
Fix the auto-tests of QtWebKit.
2011-06-27 Joe Wild <joseph.wild@nokia.com>
2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b
Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90
Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114
Make QtWebKit actually works when linked to an application.
Attempt to get Symbian building with SQLite.
Make the headers test pass by including QtGui/QColor instead of QColor.
Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG.
Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.
Use WTF::notFound instead of -1 to check for Vector::find() errors.
The autotests don't even build on Symbian, skip them for now.
Hack SystemTimeWin.cpp to build on MSVC2005.
Make Float32Array and Int16Array build on RVCT 2.x.
...
|
| | | | |\ \ \
| | | | |/ / |
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
configure.exe still needs to be regenerated.
Reviewed by: Andreas Kling
|
| | |/ / / / / |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(The since argument can contain a project name and version, defaulting
to the qdoc project if only a version number is specified.)
Refactored common code into the Generator class.
Fixed \sincelist HTML generation for tables containing only one item.
(cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606)
|
| |/ / / / / |
|
| |\ \ \ \ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Replaced std::cout with QTextStream
Reviewed-by: Eckhart Köppen
|
| |\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix QDeclarativeInspector when starting with ,block
qmlplugindump: Add -v option.
qmlplugindump: Fix emitted tooling version.
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Kai Koehne
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1.
Reviewed-by: Kai Koehne
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build on windows 7
|
| | | | | |
| | | | |
| | | | |
| | | | | |
remove pointless epocroot.pri inclusion
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Don't hang if started with ',block' argument
QDeclarativeDebug: Fix QJSDebugService if launched with ',block'
Fix docs on caching for images loaded by image providers
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
QDeclarative: fixed clean animation lists
DeclarativeObserver: Don't fade in the highlight edge
Renamed declarativeobserver plugin to qmldbg_inspector
QmlDebugger: adding slots to items in Live Preview
QmlDebugger: parsing packets iteratively in the communication protocol
qmlplugindump: Bump QtQuick.tooling version to 1.1.
qmlplugindump: Dump revision property.
qmlplugindump: Fix --path usage with drive letters on Windows.
ListView segmentation fault when setting highlight to null
DeclarativeObserver: Fixed duplicates in item selection
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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)
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix compilation of qtconfig without X11
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Patch-by: Christian Kamm
|
| | |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
Fix autotest on Windows
Compile on Mac OS X
Ammend last commit
Implemented QAccessibleTextEdit::attributes()
Changing cursor position in all boundaries
code clean-up for QSystemSemaphore
simplify QSharedMemoryPrivate::cleanHandle()
minor improvements for QSharedMemory
fix potential keyfile leaking
refactoring of the QWSSharedMemory class
allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h
minor typo fix
minor code simplification
minor code simplification
avoid the QT_NO_ASCII warning
remove an unused headers
nano optimization
don't reallocate memory if the old buffer has sufficient capacity
fix potential memory leaking
don't delete the lock if it was not created by this surface
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
our policy and even more its implementation is mildly braindead ...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
we call qmake now
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
erase messages instead of building a new list of non-dropped ones.
modify messages instead of replacing them with modified copies.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
it's inefficient to construct a new list. on top of that, the only user
actually checks the message state again.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
it's redundant with find() now, as the latter is cheap now
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
this "factory" served only to obfuscate the code
|
| | | |/ /
| | | |
| | | |
| | | |
| | | | |
qt creator as of ddb918f.
not feeling like replaying the whole history ...
|
| | |\ \ \
| | |/ /
| |/| | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* Fix some inconsistent translations.
* Translate some missing messages.
* Update Japanese phrasebook.
Merge-request: 1249
Reviewed-by: ossi
|
| | |\ \ \
| | | |/
| | |/| |
|
| | | | | |
|
| | | | | |
|
