From: Samuel Rødal <samuel.rodal@nokia.com>
Date: Mon, 2 Apr 2012 07:28:49 +0000 (+0200)
Subject: Removed Qt 5 todo comments from qpalette.h
X-Git-Tag: 071012110112~1841
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73496630fe64b3d813480dc852000edaa3acf47b;p=profile%2Fivi%2Fqtbase.git

Removed Qt 5 todo comments from qpalette.h

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 <joao.abecasis@nokia.com>
---

diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index ca619a8..96295ab 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<ColorGroup>(current_group); }