Commit Graph

20557 Commits (382ec79fab49ff490341b92056ee65a646d3ca04)

Author SHA1 Message Date
Richard Moe Gustavsen 382ec79fab QWidgetTextControl: implement support for pos argument to ImAbsolutePosition
Implement support in QWidgetTextControl for the new API that lets
you specify a position argument when querying for Qt::ImCursorPosition.

Change-Id: I123e2522d33e783e6f3467b81be872e3620d6d15
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2016-04-13 09:32:06 +00:00
Richard Moe Gustavsen 3b18888982 QTextEdit: translate IM argument before passing it on to QWidgetTextControl
Since we now have the possibility of providing an extra
position argument when querying for Qt::ImCursorPosition, we
need to ensure that we translate it from scroll view to
local coordinates before passing it on to QWidgetTextControl.

Change-Id: I4383ae3ea984b6140d8e9b4198047aec8b7e100b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2016-04-13 09:32:01 +00:00
Richard Moe Gustavsen 5391f3c72f QLineEdit: add support for Qt::ImAnchorRectangle
Change-Id: I52e15aa40af5ff77306c43209af87a3e727d2bdb
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2016-04-13 09:31:32 +00:00
Richard Moe Gustavsen ab67a5b7b6 QLineEdit: add support for ImCursorPosition with position argument
Follow up f8dbed12, and implement support for IM queries that
can take an extra QVariant argument. We use this to implement
support for ImCursorPosition with a QPointF argument that
specifies that we should return the text position under
the given point rather than the current cursor pos (0bb645b).

Change-Id: I03ae7af698241f454d35dec84f248ecd5bb6ad51
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2016-04-13 09:31:28 +00:00
Richard Moe Gustavsen 07a19c12a3 QWidgetTextControl: implement support for Qt::ImAnchorRectangle
Implement support in QWidgetTextControl for the new enum
Qt::ImAnchorRectangle.

Change-Id: I7978915454a6dd93b2f491ed15619016cda85c7e
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2016-04-13 09:31:24 +00:00
Marc Mutz 10758c5af2 Mark some QByteArray relational operators nothrow
Specifically, those that compare UTF-8 octet-streams:
- QByteArray <-> QByteArray
- QByteArray <-> const char*

For more, Qt first needs to gain a nothrow UTF-8 <-> UTF-16
comparator.

Change-Id: Ibccbdcdc3ebed5b1ac0e65c971f6f7d1bd15b6da
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-13 09:21:47 +00:00
Friedemann Kleint 5469d70418 Fix some qdoc-warnings in 5.7.
qtbase/src/corelib/global/qnamespace.qdoc:101: warning: Undocumented enum item 'AA_SynthesizeMouseForUnhandledTabletEvents' in Qt::ApplicationAttribute
qtbase/src/corelib/global/qnamespace.qdoc:2554: warning: Undocumented enum item 'ImAnchorRectangle' in Qt::InputMethodQuery
qtbase/src/corelib/statemachine/qsignaltransition.cpp:154: warning: Can't link to 'Q_COMPILER_DELEGATING_CONSTRUCTORS'
qtbase/src/gui/image/qiconloader.cpp:160: warning: Cannot find 'QIconCacheGtkReader' specified with '\class' in any header file
qtbase/src/gui/painting/qpaintengine_raster.cpp:1382: warning: No documentation for 'QRasterPaintEngine::fillPath(const QPainterPath &path, QSpanData *fillData)'
qtbase/src/testlib/qtest.h:176: warning: No documentation for 'QTest::toString(const QHostAddress &addr)'
qtbase/src/testlib/qtest_gui.h:77: warning: No documentation for 'QTest::toString(const QColor &color)'

Change-Id: If9ac0807accf2530ec7fc2ca7db71a110f9f79bb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-04-13 08:06:27 +00:00
Rolland Dudemaine d67327282f Accept correct double conversion unconditionally for GHS toolchain.
GHS floating-point libraries always handles double conversion properly.

Change-Id: Ic3c6c83e56fa0c7d29707b3939b6e7af38df0f3d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2016-04-13 08:14:54 +00:00
Rolland Dudemaine 9b35b0e8dc Make the eglfs and eglfs-viv detection and build work for INTEGRITY.
The majority of these changes is about #ifdef-ing the Linux-specific use
of /dev/fb0.
The display handle is also acquired using fbGetDisplay(), which is
equivalent to fbGetDisplayByIndex(0) but is also portable.

Change-Id: I6f460edc9c06ae7461a6aab2a816ac6f645208c4
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2016-04-13 08:14:40 +00:00
Jan Arve Saether 2687eb5a8c ImQueryInput should include ImAnchorRectangle too
Whenever we notify about ImAnchorPosition, we also need to notify about
ImAnchorRectangle

Change-Id: Ia449396e1b9e91fa0e6f95c323e31533da660171
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
2016-04-13 08:08:50 +00:00
Liang Qi eb3e3853c4 Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7 2016-04-13 09:45:58 +00:00
Eskil Abrahamsen Blomfeldt 33044b83c2 Add color font support on Windows
Detect if DirectWrite 2 is available, and support color fonts if possible.
One limitation worth mentioning is that if the color font contains regular,
monochrome glyphs as well, then these will be drawn in black, and not in the
pen color. Fixing this would require some elaborate rewrites in the font
rendering system, since we would have to have two font caches per
color font (one for mono and one for colors), or do some sort of trick where
we make argb(r, g, b, 0) mean subpixel alpha instead, and detect glyphs that
are not correctly premultiplied when blitting to the screen.

Another limitation is that the approach does not work with distance field
rendering. In principle we could support this on Windows, since the
format is vector based, but it would also require substantial work and
it is not possible to support for Apple/Google fonts anyway, so it would
just lead to code which is not cross-platform.

[ChangeLog][Windows] Added support for color fonts (color emojis) when
DirectWrite 2 is available.

Change-Id: I6a608dd5d2aa3a7e762a06830902bddac7c550a5
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-04-13 07:30:35 +00:00
Liang Qi b94773c9c8 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	config.tests/unix/compile.test
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/testlib/qtestcase.cpp
	src/testlib/qtestcase.qdoc

Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d
2016-04-13 06:55:37 +02:00
Anton Kudryavtsev 0b3e45fa0a Use takeFirst() instead of first() with removeFirst()
Reduce code size and improve readability.

Change-Id: I5ec035a39cb607f15748aaa08d73f1c1bc8e4ad8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-13 04:52:22 +00:00
Allan Sandfeld Jensen c327fb79e1 Use QTransform instead of doing transforms manually
Minor cleanup of QOutlineMapper to take advantage of QTransform.

Change-Id: I15534970a821c7f1de42f4a5a2560f04ae420d16
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2016-04-12 19:24:52 +00:00
Jesus Fernandez 0f7171f290 Better error message when trying to load an invalid resource
Before this change QFile::errorString function was returning an
"Unknown error". Now it will return the typical ENOENT string.

Task-number: QTBUG-45259
Change-Id: Ib7634f1aa5d91f77151cf92c58d3956e20a4cc6b
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-12 10:18:57 +00:00
Gabriel de Dietrich 5f41d344e9 QNSView: Disable focus ring
Not only we don't need Cocoa to display it for us, but it also
seems to take a lot of time after the call to -[NSView
setNeedsDisplayInRect:].

While resizing a large and busy widgets window, we can decrease
the relative time spent in -[QNSView flushBackingStore:region:
offset:] from over 15% down to around 3%.

Change-Id: I2a8d51be28b77c4c3da2588d9a14e461e7910167
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
2016-04-11 20:37:51 +00:00
Jake Petroules 7fb740f518 Don't indicate which versions of OS X are supported in QSysInfo docs.
This is not done for other platforms (iOS or Windows) and eliminates a
maintenance burden and potential of inconsistencies with other parts of
the documentation (as illustrated by the fact that this page indicates
the wrong minimum supported version). The Supported Platforms page will
be the authoritative (and only) source of which particular versions of a
given operating system are supported.

Change-Id: I5a31f68965265f2dcd6515b1fa9385a9e9078274
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
2016-04-11 19:45:31 +00:00
Elena Zaretskaya 3f73ecd59a Fix 2 cursors under EGLFS_KMS
Don't create hwcursor if it is disabled in QT_QPA_EGLFS_KMS_CONFIG.

Task-number: QTBUG-52403
Change-Id: I4e6f45d5b773dc2d50cd012179cd23452d910537
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2016-04-11 15:00:43 +00:00
Dmitry Shachnev f156c33c27 dbustray: Implement better detection of indicator-application
We need to do the icon cache trick all desktops using indicator-application,
these are not limited to Unity. For example, the default Xubuntu and Lubuntu
desktops use indicator-application too.

Without this, tray icons will be improperly shown on these desktops.

Change-Id: Id397bbe9b594152d7c3a29c36c853e928af7dde4
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-04-11 14:39:16 +00:00
Friedemann Kleint e108db5a9a QTestlib: Document newly added enumeration value KeyAction:Shortcut.
Amends change 0e342fce4c, fixing
a qdoc warning:
qtbase/src/testlib/qtestcase.qdoc:524: warning: Undocumented enum item 'Shortcut' in QTest::KeyAction

Change-Id: I7a7116bd5ff160c4a13f2fb0f9512f0d71385a4b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
2016-04-11 13:19:31 +00:00
Oliver Wolff cd17321213 winrt: Use correct socket error on socket close
Change-Id: I6d39b091e48a911534cb79d42d33d16041261cfb
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2016-04-11 11:22:45 +00:00
Oliver Wolff 14399b427c winrt: fix callbacks by moving them to the xaml thread
Change-Id: I7b4f007107e21c02646140acd5ebe5745ca79bce
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2016-04-11 11:22:41 +00:00
Oliver Wolff 09487deeae WinRT: Enable broadcasts
The CanBroadcast flag for QNetworkInterface indicates the ability to work
in broadcast mode. As WinRT natively supports udp broadcasts and they work out of the box
this flag should be set there.

Task-number: QTBUG-49026
Change-Id: I6623014287fe63dc1c353a6de265ebdf9114d013
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2016-04-11 11:22:36 +00:00
Marc Mutz af32319803 QTreeView: re-use cached values in rowsInserted()
The parentRowCount and the delta were already calculated
a few lines up, so don't recalculate them here.

This improves performance (rowCount() is a virtual function),
as well as readability (delta is more readable than end -
begin + 1).

Change-Id: Iabe88852a61f7ef52139e1ba446e9d3f87d6bd04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2016-04-11 11:06:59 +00:00
Marc Mutz 045e417eff [doc] QElapsedTimer: mention more clearly which functions cause undefined behavior
Change-Id: Ic7ab0d81689e2cc78f39f5f32beaea74ca10ce38
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-11 11:01:25 +00:00
Mitch Curtis 0328eec6a4 Improve grammar in QUndoStack::beginMacro() documentation
Change-Id: I4e27014a9a39abc03cee25f9753a46225efa43b9
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
2016-04-11 10:44:08 +00:00
Andreas Holzammer 093eec6fed wince: Fix intrinsics for X86 platforms when SSE2 is enabled
SSE2 can use intrinsics, which are supported by WEC2013, but for WEC7
they need to be defined.

Change-Id: I261f3db4db7abcb0b59598cef9cbad404635c3ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Gunnar Roth <gunnar.roth@gmx.net>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-04-11 05:56:49 +00:00
Louai Al-Khanji b9d386f2cc xcb: Optimize non-shm backing store flushing
Unfortunately the functions in xcb-image are quite slow, both for the
subimage generation and the byte order swapping. xcb_image_subimage is
implemented as a pixel by pixel copy, and the xcb byte swapping is done
manually without utilizing potential CPU instructions to accelerate the
swap.

Replace both with their Qt equivalents.

Change-Id: I1fe1fe5d9576fdf2bab4a8c401d2a6bb842c2727
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2016-04-10 18:29:06 +00:00
Volker Krause edaa5fc208 Remove unused variables.
Change-Id: I44f4e4f454d86e7a53b44a9b3eb51879f97ae9c6
Reviewed-by: David Faure <david.faure@kdab.com>
2016-04-10 07:39:14 +00:00
David Faure 8686ff0d9c Doc: clarify redirection handling in QNetworkRequest
The text for RedirectionTargetAttribute said the app has to handle redirections,
and only said that this attribute wouldn't be set if FollowRedirectsAttribute is set,
which was a bit confusing to read, before reading what exactly FollowRedirectsAttribute does.
It does more than removing the other attribute, it actually follows the redirection...

Change-Id: Idc634996e7b521ba05c05ca52438e47f1a411c85
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
2016-04-10 07:37:58 +00:00
David Faure b6eea89b67 Fix crash when using QLockFile in a global destructor
(for instance any global object which writes out to a config file in the
destructor). If the global cache isn't available anymore, don't use it.

Change-Id: I851a6e394d0b073aebf3ffd88b1966d424bfb92e
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-04-10 07:37:51 +00:00
Anton Kudryavtsev 62e7ec7b80 QDateTime: don't allocate memory in fromOffsetString()
Manual splitting instead of QStringRef::split()

Change-Id: I27ccf1c4e44ead5b13f85f2cdbd990cb3b874a7a
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-09 13:45:49 +00:00
Anton Kudryavtsev 684c8d4d12 QDateTime: add some const
For CoW types const methods will be called.
For QDate we can use new const getDate() method.

Change-Id: Ie3a4fe48b3635d270a79c9ac5205b835b3442eae
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-09 11:34:54 +00:00
Allan Sandfeld Jensen 307825ca63 Do not clip or rasterize paths completely outside the device rect
The controlPointRect is a conservative area that is guaranteed to
contain the path, if that does not intersect with the painter's device
rect, the path must be fully outside the painted area, and can be
ignored.

Change-Id: If14d7dbaf916aa284b941d01e773da3365dce5bf
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2016-04-09 11:22:41 +00:00
Louai Al-Khanji 5f39a0ef8d X11: Better support non-32bit visuals
This patch improves support for non-32bit screen configurations on X. The
patch mostly touches the xcb platform plugin but the changes to the glx
convenience functions do affect e.g. the offscreen plugin as well.

Since QWindow instances are now by default of type RasterGL instead of
Raster the majority of all windows are in fact instances of QXcbGlxWindow.
This means that the eventual QSurfaceFormat that we use is chosen based on
the available OpenGL configurations. Here the GLX config resolution code
did not do a very good job in trying to find the closest match relative to
the requested QSurfaceFormat, instead preferring higher bit depths.

This is an issue since many configurations support 32-bit windows even
if the screen itself has a root window with depth 16. In particular,
servers supporting both GLX and Render are very likely to have such
visuals. Particularly affected are remote X connections - even if the
application itself makes no use of OpenGL at all!

The changes introduced by this patch are as follows:
 1. Improve the GLX visual selection logic
 2. Improve the xcb visual selection logic
 3. Remove duplicated visual lookup for OpenGL-enabled windows
 4. Configure the default QSurfaceFormat to match the primary screen depth

Change-Id: Id1c176359e63a4581410e20350db5ac2c083e1cf
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2016-04-09 05:17:27 +00:00
Jake Petroules 57ecc00978 Note the introductory version of network redirection related enums.
These were missed in d815de8c26 which
originally added these values.

Change-Id: I69618c90e71f7cc01eef3db477427759e62f626b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
2016-04-09 00:01:59 +00:00
Anton Kudryavtsev 8903460093 QtBase: use erase and std::remove_if with QList and QVector
... instead of using removeAt in a loop, with quadratic complexity.

Change-Id: I38b49e56b12c396db9fc0f1b75d8fb43c503a7f6
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-08 19:35:26 +00:00
Shawn Rutledge f931e5e72d add cross-platform tablet->mouse event synth; enable on Android
It's urgent to fix the issue that on Android, it became impossible
to interact with any widget or MouseArea which handles only mouse
events but not tablet events, using the stylus, because stylus events
are sent only as QTabletEvents.  Before 5.6 (change
01d78ba86a) they were sent as
touch events, and mouse events were synthesized from those.  Whereas
on other platforms, every QTabletEvent is followed by a synthesized
QMouseEvent.

This fix proceeds in the direction that event synthesis should be done
in cross-platform code so that platform plugins don't have to repeat it,
following the same pattern as for touch->mouse synthesis.  Just as
in that case, the application can disable it, and the platform plugin
can also report that it's unnecessary for Qt to do the synthesis
because the platform already does.

So QTBUG-51618 is fixed, but QTBUG-47007 requires us to remove the
tablet->mouse synthesis from all platform plugins, because the plugin
does not know whether the tablet event was accepted or not, so it does
not have enough information to decide whether to synthesize a mouse
event.  Synthesis has been unconditional until now, which contradicts
what the documentation says: the mouse event should be sent only if
the tablet event is NOT accepted.  We can now gradually make this
promise come true.

[ChangeLog][QtCore][Tablet support] A synthetic mouse event will
no longer be sent after every QTabletEvent, only after those which are
not accepted (as documented).

Task-number: QTBUG-47007
Task-number: QTBUG-51618
Change-Id: I99404e0c2b39bbca4377be6fd48e0c6b20338466
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2016-04-08 19:33:28 +00:00
Timur Pocheptsov 53d5811b0c rcc compiler with -list on Windows (newline symbols)
Suppress '\n' -> '\r\n' replacement done by QIODevice, on Windows
fwrite to stdout will end up in such replacement, no need in
\r\r\n (reported as a bug in QtQuickCompiler originally).)

Task-number: QTRD-3497
Change-Id: I61010831b49e41b3e4fa6626054f9fb53c63bb8a
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-08 19:15:26 +00:00
Weng Xuetian b77ef8a7e6 QtDBus: clean up signal hooks and object tree in closeConnection
If a QObject is added or passed as receiver to QDBusConnection::connect()
and it is managed by Q_GLOBAL_STATIC or similar mechanism, it is
possible that when that its destructor is called after the dbus daemon
thread ends. In that case, QObject::destroyed connected via
Qt::BlockingQueuedConnection to QDBusConnectionPrivate will cause dead
lock since the thread is no longer processing events.

Task-number: QTBUG-51648
Change-Id: I1a1810a6d6d0234af0269d5f3fc1f54101bf1547
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-08 16:16:14 +00:00
Weng Xuetian b0bfe8de68 Delete the dangling generic engine object.
Change-Id: I7d7531f1a678bf186e3a992091344fff64721dec
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Lorn Potter <lorn.potter@canonical.com>
2016-04-08 16:15:44 +00:00
Dan Cape e187a16906 toCurrencyString() - Add missing documentation
Documentation was missing for the new toCurrencyString() function that
adds a precision value.

Change-Id: I16c10cdd18dfc37839fccb907470b0942f100e5d
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-04-08 16:06:29 +00:00
Alexander Grishkov f39e542eb8 Fix parsing of IPv4 addresses with certain symbols
Add some extra checks to the parser to make sure that addresses
like "300-05" aren't interpreted as valid IPv4 addresses.

Change-Id: I12475eebc9452e060779bb05e2b4ad9512a28281
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-08 15:09:50 +00:00
Edward Welbourne 4ac0686a6b Remove QDateTimeEditPrivate's duplication of QDateTimeParser code.
Both constructors set up the first, last and none members.
QDateTimeEditPrivate wants first.pos = 0, different to its base, so
keep that, but the rest merely duplicated.

Change-Id: Ice22e0495112dc3427eb35b5b73420f42d7dafc1
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-08 14:46:09 +00:00
Edward Welbourne 2996560bf8 QDateTimeEditPrivate: make clear which overrides are for which base.
The class does multiple inheritance and over-rides virtuals from both
bases; it also declared the over-rides virtual rather than declaring
them to be over-rides; so deploy Q_DECL_OVERRIDE and, while changing
those lines, move them all together and document which belong to which
base.

Change-Id: Ica3958d6d24124a537983e7e94fce642284f1f24
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-08 14:45:57 +00:00
Edward Welbourne fd5720af2c QDateTimeParser: new Section mask values simplify code.
Various |s of existing section flags were used repeatedly; naming
these masks makes the relevant code easier to read.  In QDateTimeEdit,
add a comment to make clear that its Section enum is based on QDTP's.

Change-Id: Ifd8364cd396a6d0d5ed7ae7dc4d31690f77edd30
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-08 14:45:49 +00:00
Edward Welbourne c671e66802 QDateTimeParser: mediate QLocale's meddling via a setter.
The former has (for now) nothing private, so QLocale got away with
setting its .defaultLocale explicitly; provide a setter method by
which it can do that, to allow scope for later encapsulation.

Change-Id: I77fc5fc8f868fc7cf8d51eb1c5d18926c61cbf78
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-08 14:45:38 +00:00
Edward Welbourne ee22fe13cd QDateTimeParser::parse(): improve readability
A switch (was inconsistent about whether enum members need casts and)
made it less obvious, rather than more, what was going on; so changed
it to a nested if.

Change-Id: I9af322d9dd17aa08cac5003eff2c8eaa73b50d45
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-04-08 14:45:30 +00:00
Timur Pocheptsov b414b9e6cd Remove redundant QT_PREPEND_NAMESPACE
We are already QT namespace, no need in QT_PREPEND_NAMESPACE.
The original code had invalid '::' thus referencing a name from
a global scope, it was fixed by QT_PREPEND_NAMESPACE, but
just removing '::' is enough.

Change-Id: Icda2a2ce8e474a358b74edd49bca487621608e78
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2016-04-08 12:46:13 +00:00