Merge remote-tracking branch 'origin/master' into 4.1

Change-Id: I56399e6938a5f5096c0b1a1561a54d34a5c96330

1 files changed, 5 insertions, 0 deletions

diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h
index 60dcc2fbf6..f69d72d0ab 100644
--- a/src/plugins/cpptools/cppcodestylesettings.h
+++ b/src/plugins/cpptools/cppcodestylesettings.h
@@ -80,6 +80,8 @@ public:
     //            b
     bool alignAssignments;
 
+    bool preferGetterNameWithoutGetPrefix;
+
     void toSettings(const QString &category, QSettings *s) const;
     void fromSettings(const QString &category, const QSettings *s);
 
@@ -90,6 +92,9 @@ public:
     bool operator==(const CppCodeStyleSettings &s) const { return equals(s); }
     bool operator!=(const CppCodeStyleSettings &s) const { return !equals(s); }
 
+    static CppCodeStyleSettings currentProjectCodeStyle();
+    static CppCodeStyleSettings currentGlobalCodeStyle();
+
     /*! Returns an Overview configured by the current project's code style.
 
         If no current project is available or an error occurs when getting the