| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
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
|
| | |
|
| |
| |
| |
| | |
The base function was \internal pr private.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need this to support the behavior in Gtk+ where, when
Qt::ToolButtonTextBesideIcon is used, only text labels
for important actions are shown. It will also enable us to
prioritize actions in the future when for instance collapsing
a toolbar.
Task-number: 258290
Reviewed-by: thierry
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
KDE and GNOME has the concept of a default tool button style that
can be set system-wide. Qt currently allways default to IconOnly.
I have added an optional Qt::ToolButtonSystemDefault value so you
can opt-in to respect the system setting. We did not change the
default because a lot of apps will look odd when for instance
text is beside icons and the descriptive text is too long.
Task-number: 237864
Reviewed-by: ogoffart
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Qt::TextShowMnemonic removes the '&' for us.
This is required if we want the multi-lenght-variant strings working.
Reviewed-by: Thierry
|
| |
| |
| |
| |
| |
| |
| | |
Found while documenting this internally.
I guess I had a reason for it at one point, but it
seems that I'm more concerned about what index. So
just get rid of this.
|
| |
| |
| |
| |
| |
| | |
These functions hide all this horrible casting and
we've had them for a while. When I see them, I try
to replace them as it keeps the code much more readable.
|
| |
| |
| |
| |
| | |
we should include qt_windows.h and not windows.h because we have to
define WINVER to 0x500.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This has always been a bit bumpy, the problem is that the popup normally
has its own styling from the desktop, plus it's its own top-level and
that is normally a boundary for propagation. Of course, people are
surprised by this (especially when it works for editable). So, we need
to be a bit better propagating the info. Also the QStyleOptionMenuItem
has the correct font, but if it's set on a window, by the time it
reaches the popup, its resolve mask is very weak, so it will fail to
resolve at all. Setting the point size allows the font to have a bit of
strength.
Task-number: 257486
Reviewed-by: Jens Bache-Wiig
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
NT support"
tst_QGraphicsProxyWidget crashed because the QAlphaWidget tried to access a
deleted widget. Before we had the if check, but that was removed
with this commit: 55137901. Completely wrong, we must check the widget pointer
before using it.
Reviewed-by: jbache
|
| | |
|
| |
| |
| |
| | |
The layoutState is already current (ie. already applied).
|
| |
| |
| |
| |
| |
| | |
Maximum number of decimals is DBL_MAX_10_EXP + DBL_DIG
Task-number: 257291
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Basically if you would hide a toolbar in the unified toolbar, you
would still see a little bit of area at the top instead of having
everything flush with the titlebar. This change basically unsures that
the unified toolbar makes a decision to hide itself if all the toolbars
inside it are hidden. It makes the behavior of clicking on the toolbar
button behave more or less correctly since we are going to show the
unified toolbar whether we want to or not.
This all will get the toolbar button switch event to be dispatched in
Cocoa as well.
Also add an optimization for checking if we need to change the geometry.
If we don't have any items the other toolbar areas, we can skip the set
geometry call, which wrecks havoc with things in Cocoa.
We still don't solve the case of someone who has hidden the items with
the toolbar button then goes full-screen, then goes back out. I'm not
motivated to solve it as is because we need to keep track of the
hides we do on the button press vs. other hides from the user and still
people can workaround it easy enough by handling window state change and
doing what is recommended in the docs.
Task-number: 208439
Rev-by: Denis
|
| |
| |
| |
| | |
Reviewed-by: Thierry
|
| |
| |
| |
| | |
QTimeLine is now no more used in private APIs
|
| |
| |
| |
| |
| | |
Triggered on Designer startup on Linux.
Acked-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
translations/qt_ru.ts
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We cannot assume the position of the decorations when a QGroupBox get
the focus.
Task-number: 257660
Reviewed-by: Thierry
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
If you had invisible actions in the menubar, it would always show the
extension button
|
| | | |
|
| | | |
|