Merge remote-tracking branch 'origin/10.0'

Conflicts:
	src/plugins/python/pipsupport.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/examplesparser.cpp
	tests/auto/examples/tst_examples.cpp

Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664

src/plugins/mesonprojectmanager/CMakeLists.txt

@@ -3,84 +3,85 @@ add_qtc_plugin(MesonProjectManager
   DEPENDS QmlJS
   PLUGIN_DEPENDS Core CppEditor ProjectExplorer TextEditor QtSupport
   SOURCES
-  mesonprojectplugin.cpp
-  mesonprojectplugin.h
-  versionhelper.h
-  mesonactionsmanager.h
-  mesonactionsmanager.cpp
-  toolsmodel.cpp
-  toolssettingswidget.h
-  toolssettingswidget.cpp
-  toolssettingspage.cpp
-  toolssettingspage.h
-  toolitemsettings.cpp
-  toolitemsettings.h
-  tooltreeitem.cpp
-  tooltreeitem.h
-  toolsmodel.h
-  ninjatoolkitaspect.cpp
-  ninjatoolkitaspect.h
-  toolkitaspectwidget.h
-  toolkitaspectwidget.cpp
-  mesontoolkitaspect.cpp
-  mesontoolkitaspect.h
-  toolssettingsaccessor.h
-  toolssettingsaccessor.cpp
-  settings.h
-  settings.cpp
-  mesonwrapper.cpp
-  mesonwrapper.h
-  ninjawrapper.h
-  toolwrapper.h
-  toolwrapper.cpp
-  mesontools.h
-  mesontools.cpp
-  mesoninfoparser.h
-  buildoptions.h
-  target.h
-  mesoninfo.h
-  common.h
-  buildoptionsparser.h
-  buildsystemfilesparser.h
-  infoparser.h
-  targetparser.h
-  kitdata.h
-  kithelper.h
-  mesonproject.h
-  mesonproject.cpp
-  mesonprojectimporter.h
-  mesonprojectimporter.cpp
-  mesonbuildsystem.h
-  mesonbuildsystem.cpp
-  mesonprojectparser.h
-  mesonprojectparser.cpp
-  mesonbuildconfiguration.h
-  mesonbuildconfiguration.cpp
-  ninjabuildstep.h
-  ninjabuildstep.cpp
-  mesonbuildsettingswidget.h
-  mesonbuildsettingswidget.cpp
-  buildoptionsmodel.h
-  buildoptionsmodel.cpp
   arrayoptionlineedit.cpp
   arrayoptionlineedit.h
-  mesonprocess.h
-  mesonprocess.cpp
-  mesonoutputparser.h
-  mesonoutputparser.cpp
-  ninjaparser.h
-  ninjaparser.cpp
-  mesonrunconfiguration.h
-  mesonrunconfiguration.cpp
-  projecttree.h
-  projecttree.cpp
-  mesonprojectnodes.h
-  mesonprojectnodes.cpp
-  machinefilemanager.h
+  buildoptions.h
+  buildoptionsmodel.cpp
+  buildoptionsmodel.h
+  buildoptionsparser.h
+  buildsystemfilesparser.h
+  common.h
+  infoparser.h
+  kitdata.h
+  kithelper.h
   machinefilemanager.cpp
-  nativefilegenerator.h
+  machinefilemanager.h
+  mesonactionsmanager.cpp
+  mesonactionsmanager.h
+  mesonbuildconfiguration.cpp
+  mesonbuildconfiguration.h
+  mesonbuildsettingswidget.cpp
+  mesonbuildsettingswidget.h
+  mesonbuildsystem.cpp
+  mesonbuildsystem.h
+  mesoninfo.h
+  mesoninfoparser.h
+  mesonoutputparser.cpp
+  mesonoutputparser.h
+  mesonprocess.cpp
+  mesonprocess.h
+  mesonproject.cpp
+  mesonproject.h
+  mesonprojectimporter.cpp
+  mesonprojectimporter.h
+  mesonprojectmanagertr.h
+  mesonprojectnodes.cpp
+  mesonprojectnodes.h
+  mesonprojectparser.cpp
+  mesonprojectparser.h
+  mesonprojectplugin.cpp
+  mesonprojectplugin.h
+  mesonrunconfiguration.cpp
+  mesonrunconfiguration.h
+  mesontoolkitaspect.cpp
+  mesontoolkitaspect.h
+  mesontools.cpp
+  mesontools.h
+  mesonwrapper.cpp
+  mesonwrapper.h
   nativefilegenerator.cpp
+  nativefilegenerator.h
+  ninjabuildstep.cpp
+  ninjabuildstep.h
+  ninjaparser.cpp
+  ninjaparser.h
+  ninjatoolkitaspect.cpp
+  ninjatoolkitaspect.h
+  ninjawrapper.h
+  projecttree.cpp
+  projecttree.h
   resources_meson.qrc
+  settings.cpp
+  settings.h
+  target.h
+  targetparser.h
+  toolitemsettings.cpp
+  toolitemsettings.h
+  toolkitaspectwidget.cpp
+  toolkitaspectwidget.h
+  toolsmodel.cpp
+  toolsmodel.h
+  toolssettingsaccessor.cpp
+  toolssettingsaccessor.h
+  toolssettingspage.cpp
+  toolssettingspage.h
+  toolssettingswidget.cpp
+  toolssettingswidget.h
+  tooltreeitem.cpp
+  tooltreeitem.h
+  toolwrapper.cpp
+  toolwrapper.h
+  versionhelper.h
 )
 
 file(RELATIVE_PATH RELATIVE_TEST_PATH "${PROJECT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")