| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
| |
Change 02532ec80375c686503c4250c6ad6bb211515ec8 removed the early-exit
for 0 byte reads, causing us to hit code that assumed the buffer was
empty since nothing was read. It would thus read more into the end of
the buffer, causing the buffer to grow bigger than QIODEVICE_BUFFERSIZE.
Next, if the actual number of bytes we wanted to read was bigger than
the original buffer size we'd read the same data twice.
Reviewed-by: João Abecasis
Reviewed-by: Thiago Macieira
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix auto-test failure on Mac/Linux/QWS.
Some EGL implementations does not return a EGLNativeDisplayType
Fixed the sizing of the dock area with fixed size dock widgets
QSortFilterProxyModel: Warning or assert failure
Performance issue with QGraphicsItem::ItemClipsChildrenToShape.
Fixes crash in QGraphicsItem::mouseMove for untransformable items.
Pack Graphics View booleans in quint32 bit fields.
Fixes regression: SVG image loading would fail from QBuffer with pos!=0
Fix a bug in QGraphicsItem::scroll.
Fixed the position of the dock widget when undocked
|
| | |
| |
| |
| |
| |
| |
| |
| | |
/ should not be present in the completer -> it's the current dir.
This regression happened due to a bug fix i did so the auto-test was
relying on a bug :D.
Reviewed-by:TrustMe
|
| | |
| |
| |
| |
| |
| |
| | |
when using EGL_DEFAULT_DISPLAY. Actualy what was being returned was a
void *
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
It could happen that a dock area could be too wide. The problem
was that we didn't really care whether or not the tab bar was visible.
We would always take its minimum sizehint into account.
Task-Number: QTBUG-10391
Reviewed-By: gabi
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A mapping was being created after QStandardItem::dataChanged() signal,
even though one of the item's ancestors was being filtered out by the
filter proxy. This let the QSortFilterProxyModel in a unstable state,
triggering warnings and failing asserts. This patch partialy reverts
commit f4bce41c10988.
Auto-test included.
Reviewed-by: mbm
Task-number: QTBUG-10287
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the child rect is bigger than the parent rect and parent has the
ItemClipsChildrenToShape flag set, then by updating the child, the whole
child rect is marked as dirty, resulting in a much larger update area
than required. This has a major impact on performance in Orbit/HB,
where e.g. item-views typically consist of a container item that clips
its children/items to shape. See attached video in QTBUG-9024.
Auto test included.
Task-number: QTBUG-9024
|
| | |
| |
| |
| |
| |
| | |
Caused by: 253b87180e0a6c5db0feaaed7e321139c4ff1643
Reviewed-by: Yoann
|
| | |
| |
| |
| |
| |
| |
| | |
Reduces the memory footprint of a typical GV application by
27 * sizeof(bool). Nothing revolutionary, but you know, every byte counts :-)
Reviewed-by: Jan-Arve
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the rect argument is null, well we should not do the scrolling with
an null rectangle but rather with the boundingRect like the documentation
says.
Task-number:QTBUG-10400
Reviewed-by:janarve
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed the position of the dock widget when undocked
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: gabi
Task-Number: QTBUG-9758
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Was introduced with 2fe059c. Also now updates pos() as expected after
reading in these cases.
Autotest added to catch issues where pos != 0, or wrong pos after read.
Reviewed-by: Kim
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
When one of the spin button subcontrol is activated, the state member of
fix crash in QLocalServer::close on Windows
QS60Style: QTabWidget icon size property doesn't work
PowerVR screen driver using undefined symbols
rename qt_iw.ts to qt_he.ts
QS60Style: QComboBoxPrivateScroller draws holes into menu canvas
QS60Style: QTabWidget Usability issue with capacitive screens
Fixing small memory leak in testlib.
|
| | |\ \
|/ / /
| | |
| | |
| | | |
Conflicts:
translations/translations.pri
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
When one of the spin button subcontrol is activated, the state member of
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the style option object should have QStyle::State_Sunken set in order
for styles to paint the button as pressed.
Merge-Request: 607
Reviewed-by: Andreas
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix crash in QLocalServer::close on Windows
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If _q_onNewConnection failed, then QLocalServer got into a bad state.
QLocalServer::isListening() still returned true and
QLocalServer::close() crashed.
Task-number: QTBUG-10388
Reviewed-by: ossi
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QTabWidget icon size property doesn't work
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QS60Style did check if the tab icon size was larger than pixel metric
for default tab icon size. If it was, then it reset the icon size to
match pixel metric. It was impossible to set large icon to tab widget.
As a fix, this check was removed from style.
Task-number: QTBUG-3102
Reviewed-by: Jason Barron
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
PowerVR screen driver using undefined symbols
|
| | | |\ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
PowerVR screen driver using undefined symbols
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The PowerVR screen driver was using QTransformedScreen::tranformation()
which is in a class that is Q_AUTOTEST_EXPORT. That means that it would
only work with a developer build. This contributed patch changes it to
QScreen::transformOrientation() instead which is Q_GUI_EXPORT.
Task-number: QTBUG-10193
Reviewed-by: Lorn Potter
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
rename qt_iw.ts to qt_he.ts
|
| | | |\ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
rename qt_iw.ts to qt_he.ts
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
iw comes from the obsolete ISO639. we are using ISO639-1 or something
newer.
|
| | |\ \ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QComboBoxPrivateScroller draws holes into menu canvas
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QComboBoxPrivateScroller calls eraserects for menu scroller areas,
expecting the style to fill the gaps. Unfortunately, the QS60Style
does not draw menu scrollers at all
(but they are functional when interacted with).
Therefore, these areas are now drawn as holes.
As a fix, the eraseRect call from provate class
QComboBoxPrivateScroller is removed when "s60 flag" is defined.
Task-number: QTBUG-10371
Reviewed-by: Janne Koskinen
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QTabWidget Usability issue with capacitive screens
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Normally Qt uses scrollbuttons together at right (for LeftToRight UI)
side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are
displayed below/above the widget.
Using QTabBar's scroll buttons with touch device that has capacitive
screen, is somewhat hard as the touch area for either of the scroll
buttons is somewhat smallish. So user is experiencing frequent wrong
taps. Making the touch area larger, would make the tabbar tab shape
area smaller, so it isn't a very good solution.
Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons
on either side of the QTabBar.
Task-number: QT-3104
Reviewed-by: Alessandro Portale
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing small memory leak in testlib.
|
| | |/ / / /
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jason Barron
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2
Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2
Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* Integrated http://trac.webkit.org/changeset/58673 -- Fix qtlibraryinfix not to contain space
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fixes integrated:
|| <https://webkit.org/b/33875> || [Qt] QWebPage::userAgentForUrl is terrible API ||
|| <https://webkit.org/b/38371> || [Qt] GraphicsLayer: animation incorrect when scrolling ||
|| <https://webkit.org/b/32196> || Make it possible to distinguish between NPAPI plugins and Application plugins ||
|| <https://webkit.org/b/37207> || [Qt] QtWebKit 2.0 library version needs to be maintained in WebCore.pro ||
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | /
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (25 commits)
Fixed a QBuffer warning caused by a regression in qjpeg
QGraphicsView drawing artifacts due to rounding errors.
Fixed OpenGL version flags for versions > 3.2.
Do not link QtGui in benchmarks which don't need it
Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."""
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
...
|
| | |\ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
QGraphicsView drawing artifacts due to rounding errors.
Fixed OpenGL version flags for versions > 3.2.
Do not link QtGui in benchmarks which don't need it
Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."""
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Found during investigation of QTBUG-8820, and clearly visible in
examples/graphicsview/diagramscene when slowly moving an item out of the
viewport (left and top edge). Caused by two problems:
1) Using QRectF::toRect() instead of QRectF::toAlignedRect().
2) Didn't adjust the item's bounding rect properly in drawSubtree().
QRectF::toRect() is completely useless since all the coordinates are rounded
to the nearest integer. E.g. QRectF(-0.4, -0.4, 10.4, 10.4).toRect()
-> QRect(0, 0, 10, 10), whereas toAlignedRect() returns QRect(-1, -1, 11, 11).
Then when we have a proper aligned rect, we have to adjust it by 2
pixels in all directions (or 1 pixel in case of
QGraphicsView::DontAdjustForAntialiasing). At first glance this
adjustment seems too much, since one would assume adjusing the QRectF by
0.5 before using toAlignedRect() would be sufficient. That's sufficient
in an untransformed world with pens using BevelJoin. However, the story
is completely different as soon as the world is transformed or the pens
use a different join. It's basically complicated (in some cases
impossible) to calculate a pixel perfect aligned QRect, so instead we
adjust by the amount of pixels required in the worst case.
This commit also includes some optimizations for QRegion updates (since
I anyways had to change the code). There's no point in using QRegion
granularity if the viewport update mode is either FullViewportUpdate or
BoundingRectViewportUpdate.
Auto tests adjusted and new ones included.
Task-number: QTBUG-10338
|
| |\ \ \ \ \ \ \ \
| |_|_|/ / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a small typo: therfore -> therefore
Fix a small typo in setColor description (brush -> color)
only add phonon and scripttools dependencies if they're available, otherwise linking will fail
s/INCPATH/INCLUDEPATH/
qdoc: Added breadcrumbs for most other pages.
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
linking will fail
Merge-request: 591
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Commit c1431e6d introduced an invalid QBuffer seek that generates a
warning when decoding JPEG from QBuffer. Also fixes the behavior of
seeking after the image data, and the behavior when the device is not
at position 0.
Merge-request: 2378
Reviewed-by: aavit <qt-info@nokia.com>
|
