Merge remote-tracking branch 'origin/4.11'

 Conflicts:
	src/plugins/autotest/testresultspane.cpp
	src/plugins/cmakeprojectmanager/cmaketool.cpp

Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0

2 files changed, 6 insertions, 0 deletions

diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt
index b399584948..b62d063e62 100644
--- a/src/tools/qml2puppet/CMakeLists.txt
+++ b/src/tools/qml2puppet/CMakeLists.txt
@@ -45,6 +45,7 @@ extend_qtc_executable(qml2puppet
     synchronizecommand.cpp synchronizecommand.h
     tokencommand.cpp tokencommand.h
     changeselectioncommand.cpp changeselectioncommand.h
+    drop3dlibraryitemcommand.cpp drop3dlibraryitemcommand.h
     valueschangedcommand.cpp
 )
 
@@ -110,6 +111,7 @@ extend_qtc_executable(qml2puppet
     cameracontrolhelper.cpp cameracontrolhelper.h
     mousearea3d.cpp mousearea3d.h
     camerageometry.cpp camerageometry.h
+    gridgeometry.cpp gridgeometry.h
 )
 
 extend_qtc_executable(qml2puppet
diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs
index 540a2a3c08..ca1c3654fb 100644
--- a/src/tools/qml2puppet/qml2puppet.qbs
+++ b/src/tools/qml2puppet/qml2puppet.qbs
@@ -95,6 +95,8 @@ QtcTool {
             "commands/valueschangedcommand.h",
             "commands/changeselectioncommand.cpp",
             "commands/changeselectioncommand.h",
+            "commands/drop3dlibraryitemcommand.cpp",
+            "commands/drop3dlibraryitemcommand.h",
             "container/addimportcontainer.cpp",
             "container/addimportcontainer.h",
             "container/idcontainer.cpp",
@@ -201,6 +203,8 @@ QtcTool {
             "editor3d/mousearea3d.h",
             "editor3d/camerageometry.cpp",
             "editor3d/camerageometry.h",
+            "editor3d/gridgeometry.cpp",
+            "editor3d/gridgeometry.h",
             "qml2puppetmain.cpp",
         ]
     }