summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstylesheetstyle.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-03-20 22:57:59 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-20 23:32:28 (GMT)
commit7c594907d521bb29ecca1b953a4ceea49ec32dd4 (patch)
tree98d614193f484a9f62f3080de3b55b43888f6700 /src/gui/styles/qstylesheetstyle.cpp
parent69e873e2bfae3fc028c21d93112a75008c3bb58b (diff)
downloadQt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.zip
Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.gz
Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.bz2
Compile Qt in C++0x mode.
This is not valid in C++0x: char str[] = { 128, 0 }; Because 128 cannot be represented in a char. The same applies to conversion from int to qreal: it's a narrowing conversion, with possible data loss. More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing Reviewed-by: Trust Me
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
-rw-r--r--src/gui/styles/qstylesheetstyle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 5376386..cc0ce08 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -2541,7 +2541,7 @@ void QStyleSheetStyle::setPalette(QWidget *w)
int state;
QPalette::ColorGroup group;
} map[3] = {
- { PseudoClass_Active | PseudoClass_Enabled, QPalette::Active },
+ { int(PseudoClass_Active | PseudoClass_Enabled), QPalette::Active },
{ PseudoClass_Disabled, QPalette::Disabled },
{ PseudoClass_Enabled, QPalette::Inactive }
};