| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |\ |
|
| | | | |
|
| | |/ |
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits)
Fix zooming (broke with transformOrigin default change).
doc
Move WebView to an extension plugin.
follow syntax change
missed file
Optimization.
Add autotests for script block scoping.
Make test more reliable.
Add NOTIFY signals to list, grid and path views
Example of text focus.
Add docs and tests for WorkerListModel.
Add NOTIFY signals to list, grid and path views
Example of text focus.
Add accessor operations to VisualItemModel::children
Make "on" syntax mandatory for value sources and interceptors
Fix warning.
Minor optimization.
Test GridView.onAdd & GridView.onRemove. Reduce wait()s
Replace remaining QGuard usage with QDeclarativeGuard.
Reapply "Some animation cleanup/refactoring."
...
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Using WebView now requires:
import org.webkit 1.0
Task-number: QT-2995
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: akennedy
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: akennedy
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add docs and tests for WorkerListModel.
Add accessor operations to VisualItemModel::children
Make "on" syntax mandatory for value sources and interceptors
Fix warning.
Minor optimization.
Test GridView.onAdd & GridView.onRemove. Reduce wait()s
Replace remaining QGuard usage with QDeclarativeGuard.
Reapply "Some animation cleanup/refactoring."
Setting the same source again causes reload.
Expand documention of status property with examples
Document TextEdit::textMargin
use ParentAnimation
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bearer management changes from Qt Mobility (fca9891).
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
fca98911b75ce12e70d93cfc2932a9759758a605
|
| | |\ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
removed dead code
QMetaObject::invokeMethod: print a warning if the method is not found.
Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also adapt QTestLib not to call invokeMethod on unexisting method to
avoid warnings
Task-number: QTBUG-7331
Reviewed-by: Brad
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QT-2807
|
| | |_|_|/ /
|/| | | | |
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
demos/declarative/minehunt/main.cpp
demos/declarative/minehunt/minehunt.qml
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Where you would have written
x: NumberAnimation {}
y: Behavior {}
you now must write
NumberAnimation on x {}
Behavior on y {}
This change also makes the parser more strict with respect to multiple
assignments to a single property - they're no longer allowed. For example
this
x: 10
x: 11
is now an error.
|
| | | |/ / /
| |/| | | |
|
| |/ / / /
| | | |
| | | |
| | | | |
Task-number: QT-2807
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure.exe
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
|
| | | | | | |\ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Make the Direct Show media service compile with a Qt namespace.
Make the Direct Show media service compile with mingw.
QT7; Fix warnings.
Qt namespace fixes.
Fixed QTMoview object leak.
QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
Use the monitor color space for video output.
Test for the existance of the Windows Media SDK in configure.
Try to start media playback on all load state changes.
Remove all uses of __uuidof from the Direct Show media service.
QT7; Add support for setting cookies when loading a movie.
|
| | | | | | | |/
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Andrew den Exter
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This caused the test to be unreliable -- the event loop in the main
thread would exit before the thread finished running. Now we're sure
that it's only exiting becuase the thread finished running.
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
.pro file name must match directory name.
|
| | |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
|
