| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits)
Added addMMPRules for adding conditional MMP_RULES
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
Fix for cetest.
Speed up compilation of this test with MSVC.
New benchmark for QDirIterator
Backporting auto-test utility header from master.
Fix a signed/unsigned comparison compiler warning
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Cleaning of the patch to QTBUG-3168
Patch to QTBUG-3168
Crash in QGraphicsScenePrivate::setFocusItemHelper
Pass the right arguments to QApplication in GraphicsView benchmark.
Improvements to itemview keypad navigation in S60.
Revert changes made in scroll_sys().
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Set the roleNames of proxy models to the roleNames of the source model.
Add benchmarks for accessing meta-object properties via QScriptValue
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
New benchmark for QDirIterator
Backporting auto-test utility header from master.
Fix a signed/unsigned comparison compiler warning
Cleaning of the patch to QTBUG-3168
Patch to QTBUG-3168
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Test creates a known directory tree (mimicking the v4.6.0 src/ tree in
the repository) for deep traversal and file search based on the
file names.
Reviewed-by: Olivier Goffart
|
| | | |\ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Pass the right arguments to QApplication in GraphicsView benchmark.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Failed to run the test with "-style" because wrong arguments were
passed to QApplication constructor.
|
| | | |/
| | | |
| | | |
| | | | |
Reviewed-by: Benjamin Poulain
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit also removes the complexToplevelResize test; it is not
suitable for automated testing as the output is too unstable.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
These fixes mainly concern compiling issues.
|
| | | |
| | | |
| | | |
| | | | |
QDeclarativeXXX.
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| |/ /
| | |
| | |
| | | |
Task-number: QT-2798
|
| | |
| | |
| | |
| | | |
With the recent optimizations it's just too fast now. ;)
|
|/ /
| |
| |
| | |
Reviewed-by: Harald Fernengel
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (81 commits)
Revert "Speed up QmlGraphicsItem::setParentItem."
Fix dynamic example
More strict type checking of ListElement properties.
Fix tst_QmlGraphicsLoader::networkRequestUrl autotest.
Fix tst_qmlgraphicstextedit::delegateLoading autotest
Delete the QmlImageRequestHandler in the correct thread.
Fix "AnimatedImage ignores Anchors setting"
Remove unused function that breaks build on AIX.
doc
Add support for startDragDistance in qmlviewer.
Add pixmap benchmarks and make cached rounded rect the same as Rectangle.
Make QmlDom API internal
Compile fix with namepaces
Doc: reformulate why we build a button
Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transition
Doc: onExited, onEntered only work when button pressed or hoverEnabled
Ensure visibleIndex and currentIndex are updated on itemsMoved().
QmlView API review. See QmlChanges.txt for details.
Fix example after introduction of RotationAnimation.
Animation doc fix.
...
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| | | | | |
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A couple of improvements have been made:
* Use single precision floats for the traces.
* Reduce the number of variant wrapped transforms by introducing a new
translate command.
* Reduce the number of bytes streamed per image / pixmap draw command.
* Add versioning info to qttrace files to be more future proof.
Reviewed-by: Gunnar Sletta
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Now we can easily add trace files generated with -graphicssystem
trace for
benchmarking on all relevant platforms.
Reviewed-by: Gunnar Sletta
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The firstRun block of the paint event would never be executed because
of a typo in the condition.
Reviewed-by: TrustMe
|
| | | | | |
|
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
Left-over after: 020830966e08239854ac207ec28663a80c6e0647.
This change was done in the 4.6 branch, however the qvector bench didn't
exists in the 4.6 branch.
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
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)
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
Conflicts:
src/corelib/codecs/qtextcodec.h
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
First, it doesn't make much sense to have platform specific code like
this in a benchmark. Second, the Q_OS_SYMBIAN specific values makes more sense
anyways, so we can use them on all platforms.
|
| | | | | |
|
| | | | | |
|
| |/ / / |
|
| | | |
| | | |
| | | |
| | | | |
setRotation() is already covered by the rotate() test case.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The item's transform is identity by default, so trying to set an
indentiy transform again does too little in order to measure it with
stable results.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The benchmark must report stable numbers in order to be useful. E.g. we
can not accept instability of +-20% between each run (with the same
configuration in the same environment).
|