Version control: Compile with QT_NO_CAST_FROM_ASCII.

Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index b7be53fe6d..dbb1765c39 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/src/plugins/subversion/subversion.pro
@@ -8,6 +8,8 @@ include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/vcsbase/vcsbase.pri)
 include(../../libs/utils/utils.pri)
 
+DEFINES += QT_NO_CAST_FROM_ASCII
+
 HEADERS += annotationhighlighter.h \
     subversionplugin.h \
     subversioncontrol.h \
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index b1b356a5d9..29f8196681 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1304,14 +1304,14 @@ bool SubversionPlugin::vcsCheckout(const QString &directory, const QByteArray &u
         // authentication will always fail (if the username and password data are not stored locally),
         // if for example we are logging into a new host for the first time using svn. There seems to
         // be a bug in subversion, so this might get fixed in the future.
-        tempUrl.setUserInfo("");
-        args << tempUrl.toEncoded() << directory;
+        tempUrl.setUserInfo(QString());
+        args << QLatin1String(tempUrl.toEncoded()) << directory;
         const SubversionResponse response = runSvn(directory, username, password, args,
                                                    m_settings.longTimeOutMS(),
                                                    VcsBase::VcsBasePlugin::SshPasswordPrompt);
         return !response.error;
     } else {
-        args << url << directory;
+        args << QLatin1String(url) << directory;
         const SubversionResponse response = runSvn(directory, args, m_settings.longTimeOutMS(),
                                                    VcsBase::VcsBasePlugin::SshPasswordPrompt);
         return !response.error;