| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Frequent calls to editorForIndex/indexForEditor are very slow because of
an implicit conversion from QModelIndex to QPersistentModelIndex.
This fix allows to avoid unnecessary conversions when there are no open
editors (most common case)
Backport of the 1d859ef80540ec3dd64f4f7bda3a8e415965650c commit in qtbase
Change-Id: Id4f8c985b824a83019dc8a8543dee69c12004faa
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22512
Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAbstractItemViewPrivate::renderToPixmap was not setting all the flags
that the normal QTreeView painting sets:
option.showDecorationSelected, option.viewItemPosition (so the drag pixmap
looked wrong on Windows 7, with rects around each cell), and then the
unittest also discovered that State_Children/State_Sibling wasn't set either.
Task-number: QTBUG-15834
Merge-request: 2517
Reviewed-by: Gabriel
|
|
|
|
|
|
|
|
| |
Implement the IAccessible table2 interface for itemviews.
This is simpler than what we have in complexwidgets.
For now it is only used on Linux.
Reviewed-by: Gabi
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commits
0274e68767cce6440515a68d6af868725d5577a4
2770b1277744bb676e96e4ae8c89acd645ec895d
02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1
fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d
d1f9a534da288884f443a975f428b0cfe0a7b29b
205d607c3387d074fb87f8deb77a8f515ae2e189
32d200da9cc7a4dfb3f302f22ef5718a286845c9
3e0df49f978933b1e4e6b48c695bf813ec9a2828
82bbc1c1611bde33680d22a1a3c6449e51d7b0b9
b78ffe51f9a4c4ac705e435d45fffe39864c032d
fe438d7d828021d7f86301af36fe8dff2768532a
df30d58de183d13c649ef7e0fbb8e2b3658e0862
fa845566b3733bc06454b71e33b1ff405ba32280
4f9a318d639c4e7e09e56751d31608fb39d472af
4810b587a65d81f8f90646efd09cadeb1276a756
7bad867382ad6c84155ffcfbb361709a8e8184ab
64ec011c6132496eb9555c1d09e7fd4ddf472837
81492e56aba5b5761500543665012a85d6835513
b668857b3749b39c3a61e0a25e750740b74df552
78a7a02b3b85435bc28eb23e9210522467171e42
Reviewed-By: Ralf Engels
|
|/
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
| |
Merge-request: 1132
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/development/qmake-manual.qdoc
mkspecs/symbian-gcce/qmake.conf
qmake/project.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativetext.cpp
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextdocumentlayout_p.h
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/networkselftest/networkselftest.pro
tests/auto/qscriptengine/tst_qscriptengine.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16875
Reviewed-by: Takumi ASAKI
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Reviewed-by: Olivier
Task-number: QTBUG-16175
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: mauricek
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This merge consists of the actual kinetic scroller implementation, its
autotests plus a few examples. QAbstractScrollArea and QAbstractItemView
have been extended to support the new scroll events.
The complete history is in
http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture
(part 2 is the QML Flickable replacement / part 3 is QWebView support)
Task-number: QTBUG-9054
Reviewed-by: Ralf Engels
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/features/symbian/application_icon.prf
mkspecs/features/symbian/default_post.prf
mkspecs/features/symbian/symbian_building.prf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/multimedia/audio/audio.pri
src/network/access/qnetworkaccessmanager.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/phonon/mmf/mmf.pro
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.h
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | |
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12071
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you have set the edit triggers to AnyKeyPressed and you press a key
the completer would not kick in because the key event would come before
the lineedit gets focus. The completer is only active when the lineedit
has focus.
Task-number: QTBUG14363
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | | |
Commit d34287af6fc1c forgot to update this platform dependent code.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Crash occured in tst_QTreeWidget::task253109_itemHeight
When we use loop over editorIndexHash, we cannot garantee that the key
is still a valid valid pointer, we need to confirm it with the QWeakPointer
in indexEditorHash
Reviewed-by: Gabriel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
of editors.
This change improves algorithmic time complexity for item views during
operations which directly (or indirectly such as layout) require
bi-directional lookups between model indices and persistent editor widgets.
The previous implementation scaled as O(n^2) due to the unordered search
through a QVector.
Implementations that use large numbers of persistent editors are most
dramatically improved. In one "real world" test case with 648 persistent
editors, profiling indicates an improvement of layout from 45 seconds
to 8 seconds with this change alone.
Reviewed-by: Olivier Goffart
Merge-Request: 2452
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/opengl/opengl.pro
src/opengl/qgl_p.h
src/plugins/bearer/connman/qconnmanservice_linux.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/assistant/tools/assistant/openpageswidget.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Ammends commit 8da7252de0badb818302763cbe62c38ad699f1f3
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-11466
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We were trying to check the column/row count but always from the root of
the model insteal of the root that can be defined in the view.
Task-number: QTBUG-5773
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
we were checking if the parent of main items was QModelIndex
instead if checking if it is just invalid (it might have a pointer
to its model and still be invalid).
Task-number: QTBUG-12090
Reviewed-by: Ian Walters
|
|/ /
| |
| |
| |
| |
| |
| | |
The problem was that the internal state of the tree was not correctly
reset. Patch comes from the task.
Task-number: QTBUG-10850
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QElapsedTimer doesn't initialise itself on construction, which means we were
actually depending on uninitialised data. QTime does initialise itself to NullTime.
This means the test didn't actually work if you ran it precisely at midnight...
Reviewed-By: Trust Me
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| | |
| | |
| | |
| | |
| | | |
we don't need to calldoDelayedItemLayout, setting the flag that the
widget needs the item layout is enough
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits)
Autotests: if you use X11 libs, you must link to X11 libs explicitly.
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Compile Phonon in C++0x mode.
Compile Qt in C++0x mode.
Avoid a data relocation by not trying to store a pointer in the .data section of plugins.
Fix cast-from-ascii warning
Fix compilation on Linux
Fix compilation with WINSCW: #include doesn't find files in the same dir
Rename m_volume to m_vol
Add 2 signals, introduce side widget, make it possible to reset startId
Do not create native window handle just because a parent has one.
Tab color fix for document mode on Snow Leopard.
Revert "Don't emit open signal on session close/error."
Rename networkAccess property to networkAccessible.
Don't emit open signal on session close/error.
Rename private signal.
Autotest: fix instability by accepting rounding errors
Dont force height for filter widget
- Fix importdir option on unix/linux configure
Remove incorrect semi-colons after Q_PROPERTY
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When a key event is delivered to widgets, we should accept the event if the
widget reacted to it in any way - if either the current item has changed or if
the widget scrolled.
Task-number: QTBUG-6444
Reviewed-by: Prasanth
|
| | | |
|
| | | |
|