projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d71ccb9
)
Get rid of QColorGroup from QVariant.
author
Jędrzej Nowacki
<jedrzej.nowacki@nokia.com>
Fri, 27 Jan 2012 12:22:36 +0000
(13:22 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Sun, 29 Jan 2012 22:41:25 +0000
(23:41 +0100)
The type was removed long time ago. It has type id 63 which currently
is unbound, but potentially can be reused in future.
Change-Id: I099997c9bae93ce52ba8c46275d6267c25dee4ca
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/corelib/kernel/qvariant.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/kernel/qvariant.cpp
b/src/corelib/kernel/qvariant.cpp
index
05c6c3e
..
c9bbc55
100644
(file)
--- a/
src/corelib/kernel/qvariant.cpp
+++ b/
src/corelib/kernel/qvariant.cpp
@@
-1631,7
+1631,7
@@
static const ushort mapIdFromQt3ToCurrent[MapFromThreeCount] =
QVariant::Size,
QVariant::Color,
QVariant::Palette,
-
63
, // ColorGroup
+
0
, // ColorGroup
QVariant::Icon,
QVariant::Point,
QVariant::Image,