Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	src/network/access/qhttpnetworkconnection_p.h
	tests/auto/qstyle/qstyle.pro
	tests/auto/qstyle/tst_qstyle.cpp
	tools/configure/configureapp.cpp

configure.exe will be recompiled in next commit. Took ours.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp
index 27df5d1..0c3b707 100644
--- a/src/gui/kernel/qt_mac.cpp
+++ b/src/gui/kernel/qt_mac.cpp
@@ -134,7 +134,7 @@ QColor qcolorForThemeTextColor(ThemeTextColor themeColor)
 #ifdef Q_OS_MAC32
     RGBColor c;
     GetThemeTextColor(themeColor, 32, true, &c);
-    QColor color = QColor(c.red / 265, c.green / 256, c.blue / 256);
+    QColor color = QColor(c.red / 256, c.green / 256, c.blue / 256);
     return color;
 #else
     // There is no equivalent to GetThemeTextColor in 64-bit and it was rather bad that
@@ -156,13 +156,13 @@ QColor qcolorForThemeTextColor(ThemeTextColor themeColor)
     case kThemeTextColorAlertInactive:
     case kThemeTextColorDialogInactive:
     case kThemeTextColorPlacardInactive:
-        return QColor(67, 69, 69, 255);
+        return QColor(69, 69, 69, 255);
     case kThemeTextColorPopupButtonInactive:
     case kThemeTextColorPopupLabelInactive:
     case kThemeTextColorPushButtonInactive:
     case kThemeTextColorTabFrontInactive:
     case kThemeTextColorBevelButtonInactive:
-        return QColor(123, 127, 127, 255);
+        return QColor(127, 127, 127, 255);
     default: {
         QNativeImage nativeImage(16,16, QNativeImage::systemFormat());
         CGRect cgrect = CGRectMake(0, 0, 16, 16);