Commit 6faede08 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.6'

Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
parents a299252a 14a2ff59
......@@ -168,7 +168,6 @@ void NodeInstanceClientProxy::readDataStream()
QDataStream in(m_socket);
in.setVersion(QDataStream::Qt_4_8);
if (m_blockSize == 0) {
in >> m_blockSize;
}
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QGroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QGroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget { //This is a special checkBox that does color coding for states
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QExtGroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QLabel {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
Item {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget { //This is a special doubleSpinBox that does color coding for states
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget { //This is a special doubleSpinBox that does color coding for states
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
GroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
AnimatedToolButton {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QScrollArea {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QFrame {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QPushButton {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment