From 9cf1fe4ec5d3729ceb53385aeb245a4a688823e0 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Mon, 6 Jan 2014 17:10:42 +0000
Subject: Fix screenreader rendering, and bump Windows builds to Qt-5.2

Change-Id: I4709c5fb3924a527c2ed03ed5ca36747f3031f4c

diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index 24387e0..fa8c393 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -97,7 +97,7 @@ QVariant RosterModel::data(const QModelIndex& index, int role) const {
 		case Qt::TextColorRole: return getTextColor(item);
 		case Qt::BackgroundColorRole: return getBackgroundColor(item);
 		case Qt::ToolTipRole: return getToolTip(item);
-		case StatusTextRole: return getScreenReaderTextOr(item, getStatusText(item));
+		case StatusTextRole: return getStatusText(item);
 		case AvatarRole: return getAvatar(item);
 		case PresenceIconRole: return getPresenceIcon(item);
 		case ChildCountRole: return getChildCount(item);
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 2303189..24fb371 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -383,7 +383,7 @@ if env["PLATFORM"] == "win32" :
       qtlibs.append("phonon")
       qtlibs = [lib + '4' for lib in qtlibs]
     else :
-      qtlibs += ['QtQuick', 'QtQml', 'QtV8', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport']
+      qtlibs += ['QtQuick', 'QtQml', 'QtPositioning', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport']
       qtlibs = [lib.replace('Qt', 'Qt5') for lib in qtlibs]
       qtlibs += ['icuin51', 'icuuc51', 'icudt51', 'libGLESv2', 'libEGL']
       qtplugins["platforms"] = ['windows']
-- 
cgit v0.10.2-6-g49f6