From 1d01bc1e83560cb2fc4f9f7f00762ffa5134448a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 21 Oct 2011 09:55:40 +0200 Subject: corelib: Remove Q_WS-macros. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Q_WS_QPA is the only active code path after merging refactor, other Q_WS-macros are no longer used. Enable compilation without -qpa. - Remove Q_OS_MSDOS, Q_OS_OS2 - Remove Q_WS_QWS - Remove/replace definitions/conditionals of Q_WS_XX - Remove qpa branches from profiles - Replace Q_WS_MAC by Q_OS_MAC - Replace Q_WS_MAC && !Q_WS_QPA by Q_OS_MAC && !QT_NO_CORESERVICES - Similarly in profiles: mac:contains(QT_CONFIG, coreservices) - Replace Q_FS_FAT by Q_OS_WIN Change-Id: Icce5a6c55b052c8f72b3b979ddf31a4f388ea9c9 Reviewed-by: João Abecasis --- src/corelib/tools/qrect.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/corelib/tools/qrect.h') diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 5d6db9867e..58221f4739 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -146,9 +146,6 @@ public: friend Q_CORE_EXPORT_INLINE bool operator!=(const QRect &, const QRect &); private: -#if defined(Q_WS_X11) - friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2); -#endif // ### Qt 5; remove the ifdef and just have the same order on all platforms. #if defined(Q_OS_MAC) int y1; -- cgit v1.2.3