[Development] Qt 5.4.0 header diff: QtCore.diff
Thiago Macieira
thiago.macieira at intel.com
Wed Nov 19 02:22:47 CET 2014
Impressive number of "### Qt6" comments we're adding...
qjsonobject.h
> -// typedef T *pointer;
> typedef QJsonValueRef reference;
Missing typedef for pointer, like was done for QJsonArray
> --- a/src/corelib/thread/qmutex.h
> +++ b/src/corelib/thread/qmutex.h
> @@ -101,10 +93,6 @@ struct Q_CORE_EXPORT QArrayData
>
> AllocationOptions detachFlags() const
> {
>
> AllocationOptions result;
>
> -#if QT_SUPPORTS(UNSHARABLE_CONTAINERS)
> - if (!ref.isSharable())
> - result |= Unsharable;
> -#endif
This looks wrong. QArrayData is not in qmutex.h. I don't know what went wrong
with the script.
The change itself gave me a pause, but I think it's right.
> --- a/src/corelib/tools/qeasingcurve.h
> +++ b/src/corelib/tools/qeasingcurve.h
>
> @@ -57,6 +49,13 @@ public:
> MachAbsoluteTime,
> PerformanceCounter
>
> };
>
> +
> + Q_DECL_CONSTEXPR QElapsedTimer()
> + : t1(Q_INT64_C(0x8000000000000000))
> + , t2(Q_INT64_C(0x8000000000000000))
> + {
> + }
Same issue: QElapsedTimer is not in qeasingcurve.h. And the comma is in the
wrong line.
Fix submitted: https://codereview.qt-project.org/100206
--
Thiago Macieira - thiago.macieira (AT) intel.com
Software Architect - Intel Open Source Technology Center
More information about the Development
mailing list