From 73496630fe64b3d813480dc852000edaa3acf47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Mon, 2 Apr 2012 09:28:49 +0200 Subject: Removed Qt 5 todo comments from qpalette.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The removal won't happen in Qt 5, and there's no great value in making NoRole have the value 0 at the potential risk of breaking existing code. Task-number: QTBUG-25068 Change-Id: I57238f55a23e77a783ebac47b96b4a5e62480add Reviewed-by: João Abecasis --- src/gui/kernel/qpalette.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/kernel/qpalette.h') diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index ca619a89b4..96295ab5db 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -86,12 +86,12 @@ public: enum ColorRole { WindowText, Button, Light, Midlight, Dark, Mid, Text, BrightText, ButtonText, Base, Window, Shadow, Highlight, HighlightedText, - Link, LinkVisited, // ### Qt 5: remove + Link, LinkVisited, AlternateBase, - NoRole, // ### Qt 5: value should be 0 or -1 + NoRole, ToolTipBase, ToolTipText, NColorRoles = ToolTipText + 1, - Foreground = WindowText, Background = Window // ### Qt 5: remove + Foreground = WindowText, Background = Window }; inline ColorGroup currentColorGroup() const { return static_cast(current_group); } -- cgit v1.2.3