| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|
|
|
|
| |
Reviewed-by: Olivier
Task-number: QTBUG-16175
|
|
|
|
|
|
|
|
|
| |
The timer was active, but it got killed by ~QObject. The QObject
d-pointer is deleted after the timers (as is expected), which means
that the QBasicTimer destructors in QAbstractItemViewPrivate are run
after the timers are already gone.
Reviewed-by: Trust Me
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: mauricek
|
|/ /
| |
| |
| |
| |
| |
| | |
Fixes a crash introduced in 315c09c3873f7c5d8b785443372bf975bae47ee7
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Reviewed-by: Olivier
|
| | |
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
Fixed case of a library file name to enable MinGW builds on Fedora.
Doc: Made Qt::TextLongestVariant internal again.
Doc: Fixed minor documentation issues.
Doc: Reorganized the platform and compiler notes pages.
Doc: Removed non-ASCII characters and reformatted the text.
Doc: Fixed documentation style and qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed snippet reference for the Getting Started QML guide.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Renamed an external reference to work around an auto-linking issue.
Doc: Fixed qdoc warnings.
Doc: Fixed links to the online BSD license information.
Doc: Fixed qdoc warnings.
Doc: Re-added a link to the Qt site related to testing tools.
Doc: Marked some new properties as internal for now.
Doc: Renamed a project file.
Doc: Added missing examples and snippets.
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| | |
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: gabi
Merge-request: 831
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
Previously, the code showed how to use QDirModel and was included in
the QDirModel class documentation, but it has since been changed to use
QFileSystemModel instead.
|
|/ /
| |
| |
| | |
Task-number: QTBUG-12071
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the last item is the current item and is removed,
QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
viewItems member is cleared. This commit makes sure that viewItems is
restored by calling QTreeView::doItemsLayout() in this case, preventing
that the scroll bar range is set to zero temporarily and the view is
scrolled to the top unexpectedly (this was a regression in 4.7.0:
QTBUG-13567).
Merge-request: 2481
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ranges.
Similar for mapSelectionToSource, but that one could possibly be an assert instead.
Merge-request: 2474
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|/ /
| |
| |
| |
| | |
Task-number: QT-689
Reviewed-by: David Boddie
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ammends commit 8da7252de0badb818302763cbe62c38ad699f1f3
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-11466
|
| |
| |
| |
| |
| | |
Reviewer: David Boddie
Task number: QTBUG-11938
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Calling QIconModeViewBase::initDynamicLayout() on the second and
successive segments would return QPoint(-1,-1), resulting in a
totally empty area rectangle for all the items while in
QIconModeViewBase::doDynamicLayout(). This rectangle is used to
initialize the BSP tree, and produces an arithmetic exception when
empty.
Furthermore, a rendering bug was also apparent when displaying the
first item of a segment while the last item of the previous segment
was hidden.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG-12308
|
| |
| |
| |
| |
| |
| |
| |
| | |
When the sections were moved calling logicalIndex on what was already
a logical index messed up the hidden sections.
Task-number: QTBUG-12268
Reviewed-by: Gabriel
|
| |
| |
| |
| |
| |
| |
| |
| | |
Drawing icons is quite costly and mostly, only 'file' and
'directory' are required. Speeds up application startup
considerably.
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-2446
Reviewed-by: Marius Bugge Monsen
|
| |
| |
| |
| | |
Task-number: QTBUG-10640
|
| |
| |
| |
| | |
Reviewed-by: Olivier Goffart
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/advtutorial.qdoc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Sort order was modified when sorted according to an empty column always
in the same order
Reviewed-by: Thierry
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix platform regression: Support QFont::setStretch() on Cocoa
Fix a memory leak from QItemSelectionModel when changing the model
Small hack to allow forcing off font smoothing on Mac OS X
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-By: ogoffart
Task-Number: QTBUG-10806
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently style defines QStyle::SH_ItemView_ActivateItemOnSingleClick,
which leads to itemview item activation only occur on double-click
(or tap). The item selection work native-like on Sym^3.
As a correction, style needs to check the passed styleoption and
check whether or not the state "Selected" is on. In these cases,
the itemactivation can proceed.
Task-number: QTBUG-10697
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
It could return wrong values because we were not always checking
the right cols/rows.
Reviewed-By: gabi
Task-Number: QTBUG-10169
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit 11dea4a8b227801c110f791f350632bf6f0c958d fixing QTBUG-2678 was
the wrong solution and introduced some regressions.
Auto-test included.
Reviewed-by: Thierry
Task-number: QTBUG-2678
Task-number: QTBUG-9455
|
| |
| |
| |
| |
| |
| | |
Not in use since p4 change 221452
Reviewed-by: Gabriel
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (44 commits)
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
Safeguard ourselves against corrupt registry values for cleartype gamma
fix cetest build properly
qdrawhelper: optimize the fetch transformed bilinear functions
Compile fix for WinCE
Make sure the selectionChanged signal is not called too much
Implement heightForWidth support for QTabWidget and QStackedLayout.
Fix the doc for QFrame::frameStyle
Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D
Add runtime check for GLX >= 1.3 before using glXCreatePixmap
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It could happen that it was called with empty selectionrange
Now we check to see if the selection ranges are empty
Task-number: QTBUG-9507
Reviewed-by: gabi
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits)
Fix the doc for QFrame::frameStyle
Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D
Add runtime check for GLX >= 1.3 before using glXCreatePixmap
QDrawHelper: Reduce code duplications
Improve matching X11 VisualIDs to EGL configs
Remove obsolete function set_winapp_name()
Speedup fetchTransformedBilinear in the fast_matrix case
Allow y-interted pixmaps for brushes in GL2 paint engine
Build fix for mingw
Fix build with mingw (64 bit)
Make configure.exe compatible with mingw 64
Adjust indentation
e-Ink support cleanup
Tweak the display update IOCTL calls
Support 8-Track e-Ink devices
Get stride from LinuxFB instead of calculating it ourselves.
Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.
Fixed bug in QPainterPath::intersected().
Fix compile error with QT_NO_ANIMATION
O(n^2) to O(n) optimization in QTreeWidget::selectedItems()
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
As we need to ensure that there will be no duplicates in the list
returned by QTreeWidget::selectedItems() (see commit
ea75d434e40100a9abf56195b646a8efdf3c1288), we now use a QSet to ensure
unicity while keeping the same order as before.
Reviewed-by: Olivier
Task-number: QTBUG-9485
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem was seen in Qt Creator (in the 'Sources' tab of the debugger).
Same logic as in above() and bellow()
Reviewed-by: Gabriel
|
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/|
| | |
| | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- We should not do -1 after erasing, as it is done later on.
- We should consider the 0 height even if it is not the last span.
- Added an assert.
Task-number: QTBUG-9631
Reviewed-by: Gabriel
|
|\ \ \
| |/ /
| | /
| |/
|/| |
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.h
|