Merge remote-tracking branch 'origin/4.6'

 Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/ios/iosrunfactories.cpp
	src/plugins/nim/project/nimproject.h
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
	src/plugins/qnx/qnxrunconfigurationfactory.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/winrt/winrtrunfactories.cpp

Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539

3 files changed, 34 insertions, 18 deletions

diff --git a/src/plugins/cpptools/cppelementevaluator.cpp b/src/plugins/cpptools/cppelementevaluator.cpp
index 97ee54e89ac..90fb21a34c4 100644
--- a/src/plugins/cpptools/cppelementevaluator.cpp
+++ b/src/plugins/cpptools/cppelementevaluator.cpp
@@ -63,6 +63,11 @@ CppElement::CppElement() : helpCategory(TextEditor::HelpItem::Unknown)
 CppElement::~CppElement()
 {}
 
+CppClass *CppElement::toCppClass()
+{
+    return nullptr;
+}
+
 class Unknown : public CppElement
 {
 public:
@@ -156,6 +161,11 @@ bool CppClass::operator==(const CppClass &other)
     return this->declaration == other.declaration;
 }
 
+CppClass *CppClass::toCppClass()
+{
+    return this;
+}
+
 void CppClass::lookupBases(Symbol *declaration, const LookupContext &context)
 {
     typedef QPair<ClassOrNamespace *, CppClass *> Data;
diff --git a/src/plugins/cpptools/cppelementevaluator.h b/src/plugins/cpptools/cppelementevaluator.h
index 0755bd3004e..0bececefaf4 100644
--- a/src/plugins/cpptools/cppelementevaluator.h
+++ b/src/plugins/cpptools/cppelementevaluator.h
@@ -81,6 +81,8 @@ private:
     QString m_diagnosis;
 };
 
+class CppClass;
+
 class CPPTOOLS_EXPORT CppElement
 {
 protected:
@@ -89,6 +91,8 @@ protected:
 public:
     virtual ~CppElement();
 
+    virtual CppClass *toCppClass();
+
     TextEditor::HelpItem::Category helpCategory;
     QStringList helpIdCandidates;
     QString helpMark;
@@ -96,7 +100,7 @@ public:
     QString tooltip;
 };
 
-class CppDeclarableElement : public CppElement
+class CPPTOOLS_EXPORT CppDeclarableElement : public CppElement
 {
 public:
     explicit CppDeclarableElement(CPlusPlus::Symbol *declaration);
@@ -109,7 +113,7 @@ public:
     QIcon icon;
 };
 
-class CppClass : public CppDeclarableElement
+class CPPTOOLS_EXPORT CppClass : public CppDeclarableElement
 {
 public:
     CppClass();
@@ -117,6 +121,8 @@ public:
 
     bool operator==(const CppClass &other);
 
+    CppClass *toCppClass() final;
+
     void lookupBases(CPlusPlus::Symbol *declaration, const CPlusPlus::LookupContext &context);
     void lookupDerived(CPlusPlus::Symbol *declaration, const CPlusPlus::Snapshot &snapshot);
 
diff --git a/src/plugins/cpptools/tidychecks.ui b/src/plugins/cpptools/tidychecks.ui
index 2b26492fadf..a9190b894d6 100644
--- a/src/plugins/cpptools/tidychecks.ui
+++ b/src/plugins/cpptools/tidychecks.ui
@@ -30,82 +30,82 @@
     <widget class="QListWidget" name="checksList">
      <item>
       <property name="text">
-       <string>android-*</string>
+       <string notr="true">android-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>boost-*</string>
+       <string notr="true">boost-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>bugprone-*</string>
+       <string notr="true">bugprone-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>cert-*</string>
+       <string notr="true">cert-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>cppcoreguidelines-*</string>
+       <string notr="true">cppcoreguidelines-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>clang-analyzer-*</string>
+       <string notr="true">clang-analyzer-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>clang-diagnostic-*</string>
+       <string notr="true">clang-diagnostic-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>google-*</string>
+       <string notr="true">google-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>hicpp-*</string>
+       <string notr="true">hicpp-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>llvm-*</string>
+       <string notr="true">llvm-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>misc-*</string>
+       <string notr="true">misc-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>modernize-*</string>
+       <string notr="true">modernize-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>mpi-*</string>
+       <string notr="true">mpi-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>objc-*</string>
+       <string notr="true">objc-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>performance-*</string>
+       <string notr="true">performance-*</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>readability-*</string>
+       <string notr="true">readability-*</string>
       </property>
      </item>
     </widget>