Merge upstream/4.6 into oslo-staging-2

2 files changed, 18 insertions, 3 deletions

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 1c78a47..70b7aa3 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -127,11 +127,19 @@ static const int groupBoxBottomMargin    =  2;  // space below the groupbox
 static const int groupBoxTitleMargin     =  6;  // space between contents and title
 static const int groupBoxTopMargin       =  2;
 
+/*!
+  Returns the configuration string for \a value.
+  Returns \a fallback if \a value is not found.
+ */
 QString QGtkStyle::getGConfString(const QString &value, const QString &fallback)
 {
     return QGtkStylePrivate::getGConfString(value, fallback);
 }
 
+/*!
+  Returns the configuration boolean for \a key.
+  Returns \a fallback if \a key is not found.
+ */
 bool QGtkStyle::getGConfBool(const QString &key, bool fallback)
 {
     return QGtkStylePrivate::getGConfBool(key, fallback);
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index d73a563..9188ee0 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -4713,10 +4713,17 @@ QStyleOptionTabWidgetFrameV2::QStyleOptionTabWidgetFrameV2(int version)
 }
 
 
+/*! \fn QStyleOptionTabWidgetFrameV2::QStyleOptionTabWidgetFrameV2(const QStyleOptionTabWidgetFrameV2 &other)
+    Constructs a QStyleOptionTabWidgetFrameV2 copy of the \a other style option.
+
+    If the \a other style option's version is 1, the new style option's \l
+    selectedTabRect and tabBarRect will contain null rects
+
+    \sa version
+*/
+
 /*!
-    Constructs a QStyleOptionTabWidgetFrameV2 copy of the \a other style option
-    which can be either of the QStyleOptionTabWidgetFrameV2 or
-    QStyleOptionTabWidgetFrame types.
+    Constructs a QStyleOptionTabWidgetFrameV2 copy of the \a other style option.
 
     If the \a other style option's version is 1, the new style option's \l
     selectedTabRect and tabBarRect will contain null rects