[Qt-creator] master branch broken

[Davide Coppola]

Just pulled from the master branch and it seems the latest merge of 4.5
(7f626b1182cae5407fa5495b264aa3d9170aa09d) broke it.

Nothing serious, so if anyone needs a quick fix just apply the attached
patch until the Qt guys sort things out.

Hope this helps


-- 
*Davide Coppola*

*email:* vivala...@gmail.com
*website:* http://www.davidecoppola.com
*blog:* http://blog.davidecoppola.com

<http://plus.google.com/+DavideCoppola>
<http://www.linkedin.com/in/davidecoppola>
<http://www.twitter.com/vivaladav>



‌

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index f866668..1b49a03 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -29,6 +29,7 @@
 
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/runnables.h>
+#include <utils/url.h>
 
 #include <QCoreApplication>
 
@@ -107,7 +108,7 @@ IDevice::Ptr AndroidDevice::clone() const
 QUrl AndroidDevice::toolControlChannel(const ControlChannelHint &) const
 {
     QUrl url;
-    url.setScheme(urlTcpScheme());
+    url.setScheme(Utils::urlTcpScheme());
     url.setHost("localhost");
     return url;
 }
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
index 074bbc5..1f03b5e 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
@@ -40,6 +40,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/portlist.h>
 #include <utils/stringutils.h>
+#include <utils/url.h>
 
 #include <QCoreApplication>
 
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 985a3d3..1a7b286 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -37,6 +37,7 @@
 #include <utils/icon.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
+#include <utils/url.h>
 
 #include <QCoreApplication>
 #include <QStandardPaths>
@@ -414,7 +415,7 @@ void IDevice::setSshParameters(const QSsh::SshConnectionParameters &sshParameter
 QUrl IDevice::toolControlChannel(const ControlChannelHint &) const
 {
     QUrl url;
-    url.setScheme(urlTcpScheme());
+    url.setScheme(Utils::urlTcpScheme());
     url.setHost(d->sshParameters.host);
     return url;
 }

_______________________________________________
Qt-creator mailing list
Qt-creator@qt-project.org
http://lists.qt-project.org/mailman/listinfo/qt-creator