From ec166aaa70d5451d84caf0a1ae984cacecd88d5b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 20 Feb 2013 17:53:54 -0800 Subject: Add qcore_mac_p.h to the list of headers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3a8db99166a34c15c19b142a05bf81ababb2eeb8 Reviewed-by: Tor Arne Vestbø --- src/corelib/kernel/kernel.pri | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index d2de873cef..34e32a721d 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -92,6 +92,8 @@ mac { } mac:!nacl { + HEADERS += \ + kernel/qcore_mac_p.h SOURCES += \ kernel/qcore_mac.cpp OBJECTIVE_SOURCES += \ -- cgit v1.2.3 From 1b08e0307dfebe561fbb0819a2d6b53edd8e8e93 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 20 Feb 2013 17:53:39 -0800 Subject: Don't assume that all CFPropertyListRef are CFArrayRefs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We might need more robust code in the future. But at least for this case it looks like a CFStringRef is also a possibility. Task-number: QTBUG-29776 Change-Id: Iaf50835122fcbb7e6e9c7fbf65e31e6143b2bc54 Reviewed-by: Morten Johan Sørvig Reviewed-by: Denis Dzyubenko --- src/corelib/kernel/qcore_mac_p.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index c3a3afaf6c..cbbbc18814 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -106,6 +106,7 @@ public: return *this; } inline T *operator&() { return &type; } + template X as() const { return reinterpret_cast(type); } static QCFType constructFromGet(const T &t) { CFRetain(t); -- cgit v1.2.3 From d9ff510f02bba63dabe7a081a68296056a89ae4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= Date: Sat, 23 Feb 2013 23:14:50 -0500 Subject: Rename qAbs Function for timeval This decouples it from qAbs which is declared as a constexpr under certain compilation flags and enables for qtbase to be compiled with GCC 4.8 Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 Reviewed-by: Thiago Macieira --- src/corelib/kernel/qtimerinfo_unix.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp index 0eee425cf9..7a29247fc5 100644 --- a/src/corelib/kernel/qtimerinfo_unix.cpp +++ b/src/corelib/kernel/qtimerinfo_unix.cpp @@ -94,8 +94,7 @@ timeval QTimerInfoList::updateCurrentTime() #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) -template <> -timeval qAbs(const timeval &t) +timeval qAbsTimeval(const timeval &t) { timeval tmp = t; if (tmp.tv_sec < 0) { @@ -144,7 +143,7 @@ bool QTimerInfoList::timeChanged(timeval *delta) timeval tickGranularity; tickGranularity.tv_sec = 0; tickGranularity.tv_usec = msPerTick * 1000; - return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); + return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); } /* -- cgit v1.2.3 From 6d270051a23fbfe1cb148ced365ea3a6aecf5e60 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Mon, 25 Feb 2013 13:26:07 +0800 Subject: Doc: Add the missing \since 5.0 Change-Id: I79f67e18b64efe7d22ed80adbc6f024ef35b3aac Reviewed-by: Thiago Macieira Reviewed-by: Friedemann Kleint --- src/corelib/kernel/qpointer.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index eea90be5eb..4fd6cd1779 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -158,6 +158,7 @@ /*! \fn void QPointer::clear() + \since 5.0 Clears this QPointer object. -- cgit v1.2.3