| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
|
| | |
| |
| |
| | |
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
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Eskil
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure
src/plugins/mediaservices/mediaservices.pro
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
child
While setting the hasChildren property of QTreeViewItem, "collapsed" and
"not visible" were being mistaken.
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7443
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Windows has the only font engine which supports transforming the
glyphs in the glyph cache currently. All other engines fall back to
drawing paths instead when using the raster engine. We disable
the transformation tests for platforms which aren't either Windows
or running a native graphics system.
Reviewed-by: Olivier
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits)
Skip complex FBO tests if combined depth-stencil isn't supported
Make tst_QGL::glWidgetRendering use same test as FBO autotest
Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6d67fb964b71ed3e7361367c3ccfaba5e0a )
Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ceeb37d97365cfb2f037650dbb4e495bca4e )
Adjust the mkdist-webkit script before the importation of WebKit.
Make mediaservices use existing GStreamer qmake vars
Detect GStreamer even when we're not building phonon
Fix build on systems without XVideo headers
Make the XVideo configure test actually pass if XV is present
Add a configure test for XVideo support
Fixed cosmetic glitch in QTabBar label's rendering
improve sql support for mingw64
improve 64 bit support on windows
Made the qDrawPixmaps() API public (with modifications).
Fix GL viewports under -graphicssystem raster.
QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilter is turned off
Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled.
Fix build with wingw
Imporve win64 support for mingw
Compile
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Trond Kjernåsen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Now glWidgetRendering & glFBORendering are drawing the same test
pattern. This means that if glFBORendering is failing but
glWidgetRendering is passing, it's the FBO code which is broken,
not the paint engine.
Reviewed-By: Trond Kjernåsen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QPainter has now gotten a drawPixmapFragments() function together
with a Fragment class that describes how each pixmap fragment is
supposed to be drawn.
Reviewed-by: Gunnar
Reviewed-by: Samuel
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilter is turned off
Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled.
Fix build with wingw
Imporve win64 support for mingw
Compile
Fix a memory hole in QGraphicsItemPrivate.
Fix assert in fontengine when using rotated/scaled QStaticText
Compilation fix for Symbian
Compilation fix for AIX
Fix build on Mac OS X
Fix compilation
Fix compilation on Windows
Copy useBackendOptimization setting when QStaticText is detached
Compilation on symbian
Enable QT_USE_FAST_CONCATENATION by default for compiling Qt
Compile with QT_USE_FAST_OPERATOR_PLUS
QStringBuilder: Do not resize if not required.
QStringBuilder: reduce the size of the generated code
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
dynamicSortFilter is turned off
We should not sort when inserting items if the dinamicSortFilter flag
is set to false.
Note that some of the test used to rely on the fact that it was sorted.
Those test have been fixed.
The patch has been contributed to us in the task.
Task-number: QTBUG-7716
Reviewed-by: Thierry
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
On GCC 4.0 we disabled the possibility to use the fast operator plus as
a bug in the compiler makes it impossible to add enums.
There is no normal operator+ for these case. Always test the operator% instead.
Reviewed-by: joao
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This test no longer uses QtOpenGL, therefore it doesn't need to try to
link with it.
Reviewed-by: Eskil
|
| |\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-8494
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | | | | | | | | |
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/declarative/qml/qdeclarativemetaproperty.cpp
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The behavior of createProperty() (to resolve dot properties) is now the
behavior of the constructors.
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
We don't want to allow manipulation of bindings and signal properties through
the public API. Equivalents of the public functions now exist in
QDeclarativeMetaPropertyPrivate for internal use.
|
| | |\ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | /
| | | | |_|_|_|/
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/multimedia/qml/qml.pri
src/multimedia/qml/qmlaudio_p.h
src/multimedia/qml/qmlgraphicsvideo_p.h
src/multimedia/qml/qmlmediabase_p.h
src/plugins/qmlmodules/multimedia/multimedia.cpp
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Andrew den Exter
|
| | | | |\ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Add -mediaservice argument to configure.
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
|
| | | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
|
| | | | | | |\ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
|
| | | | | | | | |/
| | | | | | |/|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Now consistent with QMediaResource.
Reviewed-by: Dmytro Poplavskiy
|
| | |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | | | | | | | | |
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-8456
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
(still doesn't work yet...)
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Allows loading/decoding local images in an asynchronous thread (already
the case for network images).
|
| | | | | | | | | |
|
