diff options
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 7 | ||||
| -rw-r--r-- | src/corelib/statemachine/qsignaltransition.cpp | 5 | ||||
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 1 | ||||
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 6 | ||||
| -rw-r--r-- | src/testlib/qtest.h | 3 | ||||
| -rw-r--r-- | src/testlib/qtest_gui.h | 3 |
6 files changed, 18 insertions, 7 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index dfa7112043..0cc9467921 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -234,6 +234,11 @@ set to true won't use the native dialogs provided by the platform. This value has been added in Qt 5.7. + \value AA_SynthesizeMouseForUnhandledTabletEvents All tablet events + that are not accepted by the application will be translated + to mouse events instead. This attribute is enabled + by default. This value has been added in Qt 5.7. + The following values are obsolete: \value AA_ImmediateWidgetCreation This attribute is no longer fully @@ -2576,6 +2581,8 @@ \value ImTextAfterCursor The plain text after the cursor. The widget can decide how much text to return, but \b{must} not return an empty string unless the cursor is at the end of the document. \value ImEnterKeyType The Enter key type. + \value ImAnchorRectangle The bounding rectangle of the selection anchor. + This value has been added in Qt 5.7. Masks: diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp index 9972487eb5..c4ba8e5315 100644 --- a/src/corelib/statemachine/qsignaltransition.cpp +++ b/src/corelib/statemachine/qsignaltransition.cpp @@ -159,9 +159,8 @@ QSignalTransition::QSignalTransition(const QObject *sender, const char *signal, Constructs a new signal transition associated with the given \a signal of the given \a sender object and with the given \a sourceState. - This constructor is enabled if compiler supports delegating constructor. - - \sa Q_COMPILER_DELEGATING_CONSTRUCTORS + This constructor is enabled if the compiler supports delegating constructors, + as indicated by the presence of the macro Q_COMPILER_DELEGATING_CONSTRUCTORS. */ /*! diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index a600aa3299..7b6bfc60b3 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -158,7 +158,6 @@ QStringList QIconLoader::themeSearchPaths() const } /*! - \class QIconCacheGtkReader \internal Helper class that reads and looks up into the icon-theme.cache generated with gtk-update-icon-cache. If at any point we detect a corruption in the file diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index d3b4acbbcd..0edd9125a3 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1345,9 +1345,9 @@ void QRasterPaintEngine::clip(const QRegion ®ion, Qt::ClipOperation op) */ -///*! -// \internal -//*/ +/*! + \internal +*/ void QRasterPaintEngine::fillPath(const QPainterPath &path, QSpanData *fillData) { #ifdef QT_DEBUG_DRAW diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 0c03ab620b..c35b767875 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -173,6 +173,9 @@ template<> inline char *toString(const QVariant &v) } #ifdef QT_NETWORK_LIB +/*! + \internal + */ template<> inline char *toString(const QHostAddress &addr) { switch (addr.protocol()) { diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index 2faf37f32b..5027aea732 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -74,6 +74,9 @@ QT_BEGIN_NAMESPACE namespace QTest { +/*! + \internal + */ template<> inline char *toString(const QColor &color) { return qstrdup(color.name().toLocal8Bit().constData()); |