| 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-2:
Speed up compilation of this test with MSVC.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This test includes a source file which is almost half a megabyte
in size. When compiling with -O2, MSVC2008 can take over 20
minutes to link this test!
Turn off optimization, just for this test.
|
| | | |\ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Removing trailing whitespace from qurl.cpp
Removing a debug() output from the test.
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Patch to QTBUG-3168 and update tst_qurl to
enable the test case that was skipped.
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |\ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | |\ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert changes made in scroll_sys().
Add benchmarks for accessing meta-object properties via QScriptValue
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Benjamin Poulain
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This simplifies the use of model view with qml and proxies.
Merge-request: 2315
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Everywhere we have a qWait(duration) followed by a QCOMPARE, there was
the risk that it fails because of the test machine being overloaded.
So I changed them to QTRY_COMPARE.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The `check' target is now automatically recursive on all subdirs
projects.
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Problem was that the cached view bounding rect was never updated when
overriding QGraphicsScene::drawItems or QGraphicsView::drawItems, without
calling the base class implementation. The same for 'updateAll' boolean.
We also have to make sure there are no unpolished items before we draw.
Regression against 4.5.
Auto-test included.
Task-number: QTBUG-7880
Reviewed-by: yoann
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QLineEdit shows leftovers of edit cursor after clear()
doc: Added indication of default modality value for panels.
doc: Added QScopedArrayPointer and corrected QScopedPointer snippet.
Improve test coverage of QScriptString::toArrayIndex()
QColorDialog::open() freezes the app the *second* time it is used on Mac
doc: Corrected typo.
doc: Removed bad grammar.
doc: Added \obsolete.
doc: Added \since 4.6 to the properties.
doc: Removed some erroneous text.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Test decimals and scientific notation.
"0.0" is not a valid array index even though it can be converted
to a whole integer, because the number converted back to a string
again is "0", which is different from "0.0". (See ECMA 15.4)
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This only happened with items that had either negative width or height
(boundingRect().width()|height()). Problem was that in case of not having
an exposed region (drawing items from QGraphicsScene::render), we simply
checked whether the bounding rect was empty or not. This is fine, however
we have to normalize the rect first.
(Note that QRegion::intersects(rect) always normalizes the rect, so
that's why this use case broke only when calling QGraphicsScene::render).
Auto-test included.
Task-number: QTBUG-7775
Reviewed-by: yoann
|
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | |
| | | |
| | | |
| | | | |
.pro file name must match directory name.
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging:
Speed up compilation of this test with MSVC.
Fix Symbian build when building for WINSCW with abld.
Fix file descriptor leak with generic engine on Linux.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This test includes a source file which is almost half a megabyte
in size. When compiling with -O2, MSVC2008 can take over 20
minutes to link this test!
Turn off optimization, just for this test.
|
| | | | | |
|
| |\ \ \ \ |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QT-2822
|
| |/ / / / |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
when running `qmake -r -tp vc', if any project is encountered which is
disabled with requires(), the generated .sln file ends up missing many
unrelated projects.
|
| | | | |
| | | | |
| | | | |
| | | | | |
tests
|
| |\ \ \ \ |
|
| | | | | | |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/declarative/qml/qdeclarativemetaproperty.cpp
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make
it work for PropertyChanges and QDeclarativeMetaProperty as well.
Task-number: QT-2783
|
| | |_|_|_|/ / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
A viewport is the thing you look through, not what you look at.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Also make one comparison a bit more fuzzy.
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Now, you have to reimplement registerTypes(uri) to expose native
QML types, and initializeEngine(engine,uri) to add instances to
the QML engine's root context.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
There's nothing meta about our properties.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QT-1817
|
| | | |_|_|/ / /
| | |/| | | | | |
|