| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Use setParent_NoEvent when parenting to group.
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/declarative/util/qdeclarativelistmodel.cpp
tools/qml/qml.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits)
different approach to fixing "the other" aliasing issue
fix aliasing issue in node_construct()
detach in fewer cases, remove redundant calculation
SSL: Fix memleak related to local certificate
Improve keyboard layout detection on X11
Compile on ARM with -Werror -Wold-style-cast
Use the vista-style native dialog for QFileDialog::getExistingDirectory
Apply the stdset attribute for resource properties
doc: Completed sentence about HideNameFilterDetails
Doc fix in QLocale
Doc for for QGestureRecognizer::create.
Fix broken setCollectionFile (creating multiple models instead reusing)
Enable the fast paths when converting to Rgb565
qdoc: ifdefed out all the debug code.
Add missing QtScript API shims
Further fix license whitespace.
Remove NetworkManager test-bed application.
Remove configure test for NetworkManager.
Fix QDir::entryList regression
Add DEFINES to mingw32/windres.exe command line.
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: Benjamin Poulain
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Further optimize for the common case where numRects == 1. Benchmarks
included.
Reviewed-by: Samuel
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (89 commits)
Compile with user defined Qt namespace
Fix regression from previous commit
Import "content" with as qualifier to support network without qmldir
Small fixes to photoviewer demo
Fix benchmark.
Add basic QUrl benchmarks.
Add busy indicator to photoviewer demo
Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange
fix installation of imports libraries
QDeclarative::isWritable optimization.
Make easing docs more consistent with other grouped property docs.
Make the loader a focusscope.
Fix typo.
Use reliable local server for HTTP testing.
Fix installation of imports libraries
Change PathView offset property to use range 0 - 1.0
Tweak benchmark
Optimization: Use linked list for context children
Add new declarative photoviewer demo
Remove dead code
...
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
|\ \
| |/
|/|
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Many of the benchmarks generate executables with same names as
the autotests. This is a big problem for Symbian, where all binaries
are stored into single directory. Renamed benchmark targets to include
'bench' in their name to ensure no overlap in target names.
Part of QtP delta reduction effort.
Reviewed-by: Liang Qi
|
| |
| |
| |
| | |
Reviewed-by: joao
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (80 commits)
doc: Fixed several qdoc errors.
Carbon: Native filedialog does not apply filters on app-bundles
Cocoa: Native filedialog does not apply filters on app-bundles
Improve performance of QTimer::singleShot
Add a benchmark comparing single shot timer with invokeMethod
use Qt's private mac functions, reduce code redundancy
Assistant: Fix compile warning for empty header.
Doc: mark QEasingCurve support functions as new in 4.7.
Modify the XML test suite not to use non-characters.
Autotest: Fix failing QTextCodec tests
Doc: mark methods as internal (as they were in previous releases)
Doc: add image for Qt Quick to "What's New" page.
qdoc: Clear a static multimap after each qdocconf file.
qdoc: Added some debug output to track down a crash
Fixed mouse wheel handling in scrollareas.
Added two missing keys for X11
Carbon: usage of menu bars can cause exceptions to be thrown
Mac: compile fix
Fix build
JPEG plugin: Use switch() instead of if()
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: joao
|
| | | |
|
|/ /
| |
| |
| | |
Reviewed-by: Gunnar Sletta
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| | |
Qt's benchmark lib does not support global data tags yet.
|
| |
| |
| |
| | |
Reviewed-by: joao
|
| |
| |
| |
| |
| |
| | |
Test were changed to run in reasonable time on Windows Mobile.
Also some test were skipped for instance those using OpenGL.
OpenGL support for Windows Mobile is a forthcoming feature.
|
| | |
|
| |
| |
| |
| | |
Get them all running again after renames, etc.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|