| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| | |
Assigning a string to a value type enum property from a binding was
not working as QmlMetaProperty didn't realise the property was of enum
type.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Now it's possible to use easing curve types directly in qml as value
types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the
former ugly string format, like "easeOutBounce(amplitude:3.0)".
Reviewed-by: akennedy
|
| |
| |
| |
| |
| |
| |
| |
| | |
This is needed for qml, in order to be able to use easing as a valuetype.
Task-number: QTBUG-8235
Reviewed-by: thierry
Reviewed-by: janarve
|
| |
| |
| |
| | |
Reviewed-by: Aaron Kennedy
|
| |\ |
|
| | |\ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
QmlBinding exposes way too many implementation details to be confident
about making it public right now.
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
is called.
Task-number: QT-2831
|
| | |/
| |/|
| | |
| | | |
Task-number: QT-2538
|
| | |
| | |
| | |
| | | |
Task-number: QT-2798
|
|/ / |
|
|\ \ |
|
| | |
| | |
| | |
| | | |
QTBUG-8166
|
| | | |
|
| | | |
|
|/ / |
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Replace QmlList* and QList* support with a single QmlListProperty type
Rename MouseRegion -> MouseArea
Update QmlChanges with animation API changes.
Document the default velocity of EaseFollow
Remove use of unexprted private classes.
Fix compile error on Solaris
Increase durations when testing Behaviors.
Add cached path rounded rect painting benchmark.
Remove use of direct event posting. Use QTest::keyClick() for keys.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
As a value type QmlListProperty doesn't consume any memory in the object.
It also has a companion QmlListReference class that is part of the public
API for C++ developers to interact with that also manages memory issues
that existed with previous solutions (if the containing QObject was
destroyed it left a dangling pointer).
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
This should make the tests at least somewhat more reliable.
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits)
Add convenience function QTextCursor::positionInBlock()
Fixed URL in Russian translation.
Designer/Resourceview: Suppress warning about QFileInfo on empty path.
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
...
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
optimize QList::mid()
optimization: use QList::reserve() in QSet::toList()
add QList::reserve()
...
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- avoid detaching if the string is already simplified
- avoid calling isSpace() multiple times on the same character
Reviewed-by: joao
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
optimize QList::mid()
optimization: use QList::reserve() in QSet::toList()
add QList::reserve()
optimization: get rid of QString::fromUtf16() usage, part 2
add QString(const QChar *) c'tor
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
instead of append()ing each element separately, reserve enough space and
do a low-level node copy.
obviously, the gain for small simple types is the biggest.
Reviewed-by: joao
Reviewed-by: denis
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Peter Hartmann
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Denis Dzyubenko
|
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Moving QDir benchmarks; making way for new test cases
Fixing QDir benchmarks...
QTreeView: Fix premature pessimization
Simplify code, fix a compiler warning... profit!
tst_qnetworkreply: Add another testcase
QNAM HTTP: Clean code a bit
QNAM HTTP: Always set channel.reply to 0 when done
Revert "Added note to make QList destructor virtual in version 5"
Fix s390(x) atomic ops related crashes
Fix undefined sequence point compiler warning
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Also, removed dependency on QtGui; gave test case a more meaningful
name; using bench_ prefix, instead of tst_ for benchmarks.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The initial state of QDirIterator is ill-defined. If the hasNext returns
true, then one must start by advancing the iterator to the first
position. (Rinse, lather, repeat)
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Peter Hartmann
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (280 commits)
Always use display() in QEglContext, so initialization can occur
Fixed a regression in dockwidgets that would jump when toplevel resized
Stabilize QGraphicsView benchmarks.
Remove platform dependent code from QGraphicsView benchmark.
Compiler warnings in QGraphicsView benchmark.
Stabilize QGraphicsScene benchmarks.
Compiler warning, unusable variable in tst_QGraphicsScene benchmark.
Documented behavior of blur effect radius and drop shadow offset.
Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.
Use correct include path for qglobal.h
Fixed softkey localizaton to comile also on platforms without softkeys.
Use correct (forward slash) separators in qmake-generated bld.inf
Fix compilation on Mac 32-bit.
Doc fix, ensure that the \obsolete tag is placed correctly
Remove unusable test case from QGraphicsItem benchmark.
Remove unstable test case from QGraphicsItem::setTransform benchmark.
Stabilize QGraphicsItem benchmarks.
Added note to make QList destructor virtual in version 5
Fix handling of Evaluation licenses on the Windows configure.exe
Change all ptrdiff_t to qptrdiff.
...
|
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/corelib/codecs/qtextcodec.h
|