| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |
|
|
| |
See commit 203b2b2c611e2 for details.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit ce02d0e9e0ad8d8ac47e4f3ee95bac5cb74ed184.
This turned out not to be enough for proper selection support
together with S60 FEP. Instead we will revert the behavior and add
new API.
(cherry picked from commit 6545932efa45ea2b8fbc1459d760ec5f15c63120)
Conflicts:
doc/src/qnamespace.qdoc
src/gui/widgets/qlineedit.cpp
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/widgets/qdatetimeedit.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlineedit.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qicoimageformat/tst_qicoimageformat.cpp
tests/auto/qmultiscreen/qmultiscreen.pro
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qresourceengine/tst_qresourceengine.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
|
| | |
| |
| |
| | |
Task-number: 258459
|
| | |
| |
| |
| |
| |
| |
| | |
setCursorPosition() should be able to set the cursor at the end of the
string. This is a copy-paste error made when refactoring QLineEdit.
Reviewed-by: Gunnar
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When selecting the text and setting the cursor position, we need to
emit the cursorPositionChanged signal. This seems to be a copy-paste
error from refactoring QLineEdit, as the function call is there in the
original version of setSelection(). The effect was two test breakages
in tst_QDateTimeEdit, because the section and cursor position of the
QDateTimeEdit would be out of sync.
Reviewed-by: Gunnar
|
| | | |
|
| | |
| |
| |
| | |
Reviewed-by: trustme
|
| | |
| |
| |
| |
| | |
We needed to call ensurePolished before updating the
action rects.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Two-finger panning will work on all QAbstractScrollArea based widgets, however
single-finger panning will be enabled only on some special widgets that always
wants it - for example we don't want it on QGraphicsView, and we might want it
on itemviews *sometimes*.
Reviewed-by: trustme
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Moved the code that subscribes to native gestures on Windows to a private
function in QWidget which will check which gestures the widget is subscribed to
and enable native gestures as requested.
Reviewed-by: trustme
|
| | |
| |
| |
| |
| |
| |
| | |
Somehow forgot to hook up the blinking signal (in the new QLineControl)
to QLineEdit.
Reviewed-by: Trust Me
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
A non painted (ie. garbage) area could appear if you had a fixed size
dock widget and you moved the separator. The previous place where the
separator was painted was not updated
|
| | |
| |
| |
| |
| | |
We were calling pixelMetric and sizeFromContents with a NULL styleoption
That crashes on mac and might also with other styles.
|
| | |
| |
| |
| | |
RevBy: Trust me
|
| | |
| |
| |
| |
| |
| | |
Rationale: We're using template magic now to get the private
pointer in qglobal.h, so no need to have two macros. Also
keeps backward compatibility with outside (KDE) code.
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
doc/src/classes/qnamespace.qdoc
examples/examples.pro
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qobject.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qstandardgestures.h
src/gui/kernel/qwidget.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| | |
It doesn't make much sense to have that low-level info neither in the base
QGesture class, nor in the QPanGesture, as the latter one has offset properties
instead.
Reviewed-by: trustme
|
| | |
| |
| |
| |
| |
| |
| | |
The action now try to take advantage of the space given by a minimum
width. Patch proposed initially by Aron Seigo and improved later on.
Reviewed-by: Trustme
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/global/qglobal.h
src/corelib/kernel/qmetatype.cpp
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/itemviews/qheaderview.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qgesture.h
src/gui/kernel/qgesturerecognizer.h
src/gui/painting/qpaintengine_raster.cpp
src/network/access/qhttpnetworkreply.cpp
src/network/access/qnetworkcookie.h
src/network/socket/qnativesocketengine_unix.cpp
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)
|
| | | |
| | |
| | |
| | |
| | |
| | | |
A lot of the logic was factored out of QLineEdit(Private) and into a
private class called QLineControl, however the changes did not compile
when keypad navigation is enabled so fix them.
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
config.tests/unix/openssl/openssl.pri
demos/embedded/embedded.pro
examples/itemviews/chart/chart.pro
examples/network/network.pro
examples/painting/painterpaths/painterpaths.pro
examples/threads/mandelbrot/mandelbrot.pro
qmake/project.cpp
src/3rdparty/libtiff/libtiff/tif_config.h
src/corelib/arch/arch.pri
src/corelib/global/qglobal.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcore_unix_p.h
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/corelib/tools/qsharedpointer_impl.h
src/corelib/tools/tools.pri
src/gui/kernel/qaction.h
src/gui/kernel/qapplication.cpp
src/gui/painting/qregion.h
src/gui/widgets/qlineedit.cpp
src/gui/widgets/qlineedit_p.h
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/qdir/tst_qdir.cpp
tests/auto/qdiriterator/tst_qdiriterator.cpp
tests/auto/qhttp/qhttp.pro
tests/auto/qline/qline.pro
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qsharedpointer/qsharedpointer.pro
tests/auto/qstring/qstring.pro
tests/auto/qtcpsocket/qtcpsocket.pro
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Menu paintEvent was not called when the mouse cursor lied
between the menu item area and the menu frame border.
Task-number: 258920
Reviewed-by: olivier
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Task: 254724
Reviewed-By: TrustMe
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Manually merged from the kinetic repository, where it has been used
for a while. Like QTextControl, there is no auto test for the control,
just for the widgets built with it.
The purpose of this change is so that we can build stuff like QLineEdit
in other places (like kinetic). Also included is a trivial change to
QValidator, needed to use it with QLineControl in QML.
Reviewed-by: mbm
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
demos/demos.pro
src/gui/graphicsview/qgraphicsitem_p.h
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When you have an icon set we do not show the text label,
but the previous code would still use the text for the size
hint calculation.
Task-number: 218836
Reviewed-by: ogoffart
|
| |\ \ \
| |/ / |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Call [NSToolbar setShowsBaselineSeparator] on the (unified) toolbar
if the window contains tabs in document mode.
Task-number: 252660
Reviewed-by: Richard Moe Gustavsen
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/corelib/io/io.pri
src/corelib/io/qfilesystemwatcher.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/configure/configureapp.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When opening a menu by shortcut on Windows, we would loose
the keyboard mnemonic when navigating around. This is incorrect
compared to native applications and somewhat inconvenient.
The fix is basically to enable the keyboard mode when shortcuts
are triggered, not only when the alt-key is pressed.
Task-number: 254496
Reviewed-by: denis
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
ends up on the right X11 screen.
Merge-request: 987
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There was an attempt to do this earlier, but it was a bit more complex
than it needed to be. We now do the update on show in Cocoa. Carbon
actually does it all for us, we just need to flip the bit. We may do the
updates to often, but it's better than not enough.
Task-Id: 195445
Reviewed-by: Denis
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Apparently it changes the behavior of Qt too much and also breaks the
text input in some keyboard layouts (for example in German layout you
need to be able to use Ctrl and Alt or AltGr modifiers to type text).
Revert "Don't insert text into a text widget when a modifier is pressed."
This reverts commit 099a32d121cbc80a1a234c3146f4be9b5237e7e8.
Revert "Fixed the qlineedit autotest."
This reverts commit 9210e8cdc83b6812d10f5f5847d05703ef2e5f7c.
|
| |\ \ \
| |/ /
| | /
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
qmake/Makefile.unix
qmake/generators/makefile.cpp
src/corelib/global/qglobal.h
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qaction.cpp
src/gui/kernel/qaction.h
src/gui/kernel/qaction_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget.h
src/gui/kernel/qwidget_mac.mm
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/styles/qwindowsstyle.cpp
src/gui/text/qfontengine_qpf.cpp
src/gui/widgets/qabstractscrollarea_p.h
src/network/access/qnetworkaccessdebugpipebackend.cpp
src/network/socket/qlocalsocket_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qdir/tst_qdir.cpp
tests/auto/qfile/tst_qfile.cpp
tests/auto/qobject/tst_qobject.cpp
tests/auto/qpathclipper/qpathclipper.pro
tests/auto/qprocess/tst_qprocess.cpp
tests/auto/qsettings/tst_qsettings.cpp
tests/auto/qsharedpointer/qsharedpointer.pro
tests/auto/qsqlquerymodel/qsqlquerymodel.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qwidget/tst_qwidget.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Set the native key equivalent for menu items only for single key
shortcuts. Qt's shortcut mechanism will take care of sending the
multiple key shortcut events.
Task-number: 258438
Reviewed-by: Norwegian Rock Cat
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Mac supports only single key shortcuts as key equivalent for menu items.
So if a multiple key QKeySequence is set, use Qt's shortcut mechanism
instead of the native menu shortcut mechanism.
Task-number: 258438
Reviewed-by: Norwegian Rock Cat
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Since there is more than one standard shorcut for closing a MDI window,
then ensure that all of them can be used.
Task-number: 161999
Reviewed-by: Simon Hausmann
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
Regression since my last commit.
Task-number: 152227
|
| | |
| |
| |
| |
| |
| |
| | |
This is also a work around for a bug in gcc on powerpc (embedded-linux)
Task-number: 258358
Reviewed-by: jbache
|
| | | |
|
