| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
/ 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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* '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"
...
|
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
|\ \ \ \ |
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the system supports an OpenGL version higher than what is
recognized by Qt, all the version flags up to 3.2 should be set.
Reviewed-by: Trond
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 598
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-by: Joao
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QStackedLayout."""
This reverts commit 1f00130097f81bc78aebb3c055f38c066221bc98.
(Sorry about this. The previous commit got pushed by accident. The proper
fix has been done for 4.8 instead.)
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
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.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
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.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
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.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Adding the post-build step to copy the dll into bin
Reviewed-By: Thierry
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When setting up the CGContextRef for a painter we need to take
into account both the redirection-transform and the transform
on the painter.
Reviewed-by: Gunnar
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: Gunnar
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The variables QMAKE_LFLAGS_DEBUG, QMAKE_LFLAGS_RELEASE,
QMAKE_CXXFLAGS_DEBUG and QMAKE_CXXFLAGS_RELEASE are handled by .prf
files in mkspecs/features and don't need to be evaluated by generators.
Reviewed-by: ossi
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some class uses QFactoryLoader without checking if QT_NO_LIBRARY is not
defined. Remove QT_NO_SETTINGS used with QT_NO_LIBRARY for
QFactoryLoader because LIBRARY depends on SETTINGS.
Merge-request: 578
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Checked for qdoc errors.
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We don't have to evaluate QMAKE_FLAGS_CONSOLE or QMAKE_LFLAGS_WINDOWS.
These files do it for us:
mkspecs/features/win32/console.prf
mkspecs/features/win32/windows.prf
Reviewed-by: andy
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We don't have to evaluate QMAKE_CXX_FLAGS_WARN_ON / ..._OFF
mkspecs/features/warn_on.prf / ..._off.prf do it for us.
Reviewed-by: andy
|
| | | | |\ \ |
|
| | | | | |\ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
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.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When drawing text using glyphs, the shader manager will select the
"MaskFragmentShader" which requires a varying called "textureCoords"
which is used to sample the glyph from the glyph texture. That's
fine, except when you try to use one of the pattern brushes or a
texture brush, because the src pixel fragment shader snippets for
those brushes also sample from a texture (the brush texture) and name
the verying they use "textureCoords" too. This led to textureCoords
being defined twice, which in turn caused a shader compile error
which then casued the seg-fault. This patch simply renames the
varying used to pass the coordinates for the brush texture so it
doesn't conflict.
Reviewed-By: Kim
Task-Number: QTBUG-9522
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
It could return wrong values because we were not always checking
the right cols/rows.
Reviewed-By: gabi
Task-Number: QTBUG-10169
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is not supposed to be allowed, but it work with other browsers
Rask-number: QTBUG-7434
Reviewed-by: Thiago
Reviewed-by: Markus Goetz
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fixes crash for certain SVGs
Reviewed-by: Kim
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This reverts commit 5f63f95def838ce72af99dc697ecce092fe7eb69.
Fixes GL graphics system on Windows. With the patch, windows would pop
up as completely empty.
|