| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView doesn't update if preferred highlight range changes.
Image.PreserveAspectFit has unexpected effect on Image's sourceSize
Doc improvement for Image.fillMode.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Simply call refill() when they change.
Change-Id: I45ab56cbcaf5c726ce4c4f23f66ee687a6d89dad
Task-number: QTBUG-15356
Reviewed-by: Kevin Wu Won
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The sourceSize should always be the size of the image, unless set
otherwise. When calculating the size of an image with
Image.PreserveAspectFit set the natural image size should be used
for the calculation if no size has been set explicitly.
Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69
Task-number: QTBUG-16389
Reviewed-by: Joona Petrell
|
| | | |
| | |
| | |
| | |
| | | |
Change-Id: I2aec2c9fae07a8551001b2c7d5f5ab8da0fbb7df
Task-number: QTBUG-14899
|
| | |\ \
| | |/
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeView flickers when composited on MeeGo
Re-enable lineHeight tests.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for
QDeclarativeView on meego.
Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424
Task-number: QTBUG-17173
Reviewed-by: Michael Brasser
|
| | | |
| | |
| | |
| | |
| | |
| | | |
These tests were disabled by 24d8e96624af91ab01a20c10625858300f16099b
Change-Id: I5bf3e11dfb3c975415c3039b39a39c22984d2900
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Introduce QGraphicsItem::ItemStopsFocusHandling flag
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Introduce QGraphicsItem::ItemStopsFocusHandling flag
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When set for an item, QGraphicsScene will skip focus handling for this item and
everything underneath it (including focus-out). Allows users to reimplement
custom focus handling.
Use case: touch devices that implement panning. Here, focus-in has to happen
only if no panning was triggered. Analogous, no focus-out should happen when
panning was detected.
Fixes the alternative proposal ("black holes for focus changes") of
QTBUG-16343: QGraphicsView doesn't support focus change on mouse release.
The previous test was only testing one scenario, which didn't give a good idea
whether the flag was actually working as intended.
Task-number: QTBUG-17505
Reviewed-by: Yoann Lopes
Reviewed-by: Jan-Arve Sæther
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for wrong dpi metrics for raster pixmaps on Symbian.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The original implementation relied on SizeInTwips() for the underlying
bitmap which unfortunately returns 0, leading to incorrect results
from QPixmap::logicalDpiX/Y(). This caused issues in text rendering
onto pixmaps (QTBUG-17628). This fix changes QS60PixmapData to use a
slightly different metrics() implementation (the one VG and GL
PixmapData are using).
Task-number: QTBUG-18154
Reviewed-by: Jani Hautakangas
|
| | |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Qt.include() used in WorkerScript is broken on Windows.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The script local filename was used to resolve the source URL rather
than the script URL.
Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce
Task-number: QTBUG-17977
Reviewed-by: Aaron Kennedy
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (61 commits)
QTcpSocket: Fix for disconnect in Unbuffered mode.
QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.
Added automatic graphicssystem switching on meego when app is minimized.
Disabled non-QDeclarativeItems in Flickable break flicking
Hot fix for compilation without QGL_USE_TEXTURE_POOL
Initial implementation of GLES2.0 resource pooling
Designer: Fix a bug affecting tab reordering of promoted tab widgets.
Designer: Fix a bug clearing the Z-Order when adding a new widget.
Adjust right bearing when breaking with line separators
Fix the license info for bin/elf2e32_qtwrapper.pl.
Avoid panics in QDesktopWidget on Symbian emulator.
QS60Style: use placeholder texture when polishing widgets and palette
Regression: QS60Style: Theme background is incorrect
Remove changes from fix to QTBUG-17045 that were not related to the fix
Prevent null pointer crash when closing splitview
Border still drawn on Rectangle elements when border.width == 0
Regression: currentIndex was not set correctly after model cleared.
Remove bindings before assigning constants in VME
QNAM HTTP: error() in case connection is closed unexpectedly
Prevented infinite recursion in QPainterPath::contains().
...
|
| | |\ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
We need to set the state properly after we have been disconnected.
Also fix the HTTP layer, it needs to handle the disconnect
when reading.
Reviewed-by: Peter Hartmann
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
configure
mkspecs/symbian-gcce/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/win32/mingw_make.cpp
src/corelib/global/global.pri
src/corelib/global/qglobal.h
src/opengl/qgl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/wayland/qwaylandbuffer.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/designer/src/components/formeditor/qdesigner_resource.cpp
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.
Added automatic graphicssystem switching on meego when app is minimized.
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
As the data may be aligned/padded by the X driver.
Fixes: NB#231246 : Incorrect stride used when QMeeGoLivePixmap width not multiple of eight
Merge-request: 1115
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
When all top-level widgets are minimized we switch to raster to reduce
GPU memory consumption. We switch back to graphicssystem meego when at
least one top-level widget is shown normally again. The switching only
applies when the runtime graphicssystem is being used. The switching
only applies when the runtime graphicssystem is being used.
Task-number: QTBUG-18013
Reviewed-by: Armin Berres
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / /
| | | |/| | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Disabled non-QDeclarativeItems in Flickable break flicking
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Allow Flickable to steal grab from items that are disabled.
Change-Id: I71e401cd78695ecb2c3d47abde1c3d13e722d848
Task-number: QT-4677
Reviewed-by: Michael Brasser
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / /
| | | |/| | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Hot fix for compilation without QGL_USE_TEXTURE_POOL
Initial implementation of GLES2.0 resource pooling
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-by: TRUSTME
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Keep the implementation in separate
qpixmapdata_poolgl.cpp file until the pooling has
been verified and confirmed to work ok.
Task-number: QTBUG-15253 QTBUG-17850
Reviewed-by: Samuel Rødal
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / /
| | | |/| | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Designer: Fix a bug affecting tab reordering of promoted tab widgets.
Designer: Fix a bug clearing the Z-Order when adding a new widget.
Adjust right bearing when breaking with line separators
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Event filter was added twice due to widget initialization being
done twice caused by recursion of WidgetFactory::createWidget()
in the case of a fallback to promotion when a custom widget
plugin is missing.
Task-number: QTBUG-18121
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Wrong list was used when adding widgets.
Task-number: QTBUG-18120
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
If we found a forced line break with line separator (e.g. '\n'),
take the right bearing of previous glyph into account, otherwise
the resulting text width will be slightly smaller than the one
without a line separator.
Task-number: QTBUG-17020
Reviewed-by: Eskil
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | / / / /
| | | |_|_|_|/ / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits)
Fix the license info for bin/elf2e32_qtwrapper.pl.
Avoid panics in QDesktopWidget on Symbian emulator.
QS60Style: use placeholder texture when polishing widgets and palette
Regression: QS60Style: Theme background is incorrect
Remove changes from fix to QTBUG-17045 that were not related to the fix
Prevent null pointer crash when closing splitview
QS60Style slows down layout switch by updating widgets unnecessarily
Fix qgraphicstransform autotest for Symbian, where qreal is float.
Removed reference to nonexistant profile.
Disable capabilities example for symbian-gcce due to a bug in elf2e32
Readded a ';;' that was removed by mistake.
Fixed mkspec detection for Symbian.
Removed javascript-jit from default symbian-gcce build.
Corrected a mismerge in GCCE link parameters.
Fixed incorrect referral to an include file.
Fixed win32-msvc2008 build regression.
Made qmake strip trailing \ from libdirs.
Fixed GCCE libdir handling if the paths have spaces in them.
Added MinGW support for adding lib prefix and extension via profile.
Added support for various special compiler/linker flags on MinGW.
...
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: TrustMe
|
| | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
There is usually only one screen on the emulator and it was incorrectly
assumed that ScreenDevice() would return null for a non-existing
screen. It panics instead so the entire call must be skipped.
Reviewed-by: Sami Merila
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Background texture is not created until it is actually painted.
This allows skipping the whole background texture creation, if app
overwrites the QPalette::Window with its own data (image or color).
When widget is drawn and style notices that the widget is still using a
placeholder (1*1 red QPixmap) texture, it creates the real texture and
uses that for drawing.
Note that accessing QPalette::Window will give the placeholder pixmap.
Which is then again replaced with the real texture, if it is drawn
through the qt_s60_fill_background().
Task-number: QTBUG-14910
Reviewed-by: Laszlo Agocs
|
| | | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fix for QTBUG-16816 cause theme background to display incorrectly
after a layout switch is done. Theme background is shown "tiled"
instead of being whole screen size.
This is because the setBackgroundTexture() call was removed to "save"
QPixmap creation. Unfortunately, it really skips the background
texture creation, but does not re-create a new one for the new layout,
so portrait background is used again. This leads to tiling the image.
Let's just return the call to the setBackgroundTexture()
(this will eventually anyway be "optimized" with fix for QTBUG-14910).
Task-number: QTBUG-17930
Reviewed-by: Laszlo Agocs
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
There were changes included in the fix for QTBUG-17045 that were not
supposed to be part of that fix. These changes to qcombobox.cpp are
now removed.
Task-number: QTBUG-17045
Reviewed-by: TrustMe
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Prevents crash when focus item is not set and splitview is closed.
This is partial fix to QTBUG-17045.
Task-number: QTBUG-17045
Reviewed-by: Guoqing Zhang
|
| | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: QTBUG-17907
Reviewed-by: Samuel Rødal
|
| | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Probably this was a result of backporting symbian-gcce support from
4.8 to 4.7.
RevBy: Liang Qi
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Phonon exports template instantiations. These exports get weak symbol
binding, which is correct according to the C++ ABI, but the problem
is that elf2e32 has a bug which does not transfer the weak symbols
correctly to the dso file. Therefore, the example will work if you
have a prebuilt Qt version and use GCCE, but not if you build Qt from
scratch using GCCE.
For normal non-template symbols it is not a problem since they get
global bindings. RVCT also produces global bindings.
RevBy: Shane Kearns
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
RevBy: Trust me
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
RevBy: Liang Qi
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
It fails the build anyway.
RevBy: Liang Qi
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
RevBy: Trust me
|
