From 65197439337ddf9efcfcdbc3223573858e5fe611 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 3 Aug 2015 13:47:11 +0200 Subject: Doc: added documentation to undocumented functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-36985 Change-Id: I219375d405fbfb53611c0138698e955d9cd5d821 Reviewed-by: Venugopal Shivashankar Reviewed-by: Topi Reiniö --- src/quick/items/qquicktextdocument.cpp | 7 +++++++ src/quick/scenegraph/coreapi/qsgmaterial.cpp | 8 +++++++- src/quick/scenegraph/util/qsgtextureprovider.cpp | 8 ++++++++ src/quick/util/qquickimageprovider.cpp | 21 +++++++++++++++++++++ src/quickwidgets/qquickwidget.cpp | 7 ++++++- 5 files changed, 49 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp index b34ae24461..fa89d43b86 100644 --- a/src/quick/items/qquicktextdocument.cpp +++ b/src/quick/items/qquicktextdocument.cpp @@ -63,6 +63,10 @@ public: QPointer document; }; +/*! + Constructs a QQuickTextDocument object with + \a parent as the parent object. +*/ QQuickTextDocument::QQuickTextDocument(QQuickItem *parent) : QObject(*(new QQuickTextDocumentPrivate), parent) { @@ -72,6 +76,9 @@ QQuickTextDocument::QQuickTextDocument(QQuickItem *parent) d->document = QPointer(qobject_cast(parent)->d_func()->document); } +/*! + Returns a pointer to the QTextDocument object. +*/ QTextDocument* QQuickTextDocument::textDocument() const { Q_D(const QQuickTextDocument); diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index c68c0b93d2..367c0b1ee5 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -188,6 +188,9 @@ QSGMaterialShader::QSGMaterialShader() { } +/*! + \internal + */ QSGMaterialShader::QSGMaterialShader(QSGMaterialShaderPrivate &dd) : d_ptr(&dd) { @@ -463,7 +466,10 @@ QMatrix4x4 QSGMaterialShader::RenderState::combinedMatrix() const Q_ASSERT(m_data); return static_cast(m_data)->currentCombinedMatrix(); } - +/*! + Returns the ratio between physical pixels and device-independent pixels + to be used for rendering. +*/ float QSGMaterialShader::RenderState::devicePixelRatio() const { Q_ASSERT(m_data); diff --git a/src/quick/scenegraph/util/qsgtextureprovider.cpp b/src/quick/scenegraph/util/qsgtextureprovider.cpp index b9f9bde476..2d05e736fe 100644 --- a/src/quick/scenegraph/util/qsgtextureprovider.cpp +++ b/src/quick/scenegraph/util/qsgtextureprovider.cpp @@ -44,7 +44,15 @@ QT_BEGIN_NAMESPACE \sa {Scene Graph - Two Texture Providers} */ +/*! + \fn QSGTexture *QSGTextureProvider::texture(); + Returns a pointer to the texture object. + */ +/*! + \fn void QSGTextureProvider::textureChanged(); + This signal is emitted when the texture changes. + */ QT_END_NAMESPACE diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index a231209cd0..6038967e18 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -365,5 +365,26 @@ QQuickTextureFactory *QQuickImageProvider::requestTexture(const QString &id, QSi return 0; } +/*! + \fn QImage QQuickImageProvider::requestImage(const QString &id, QSize *size, const QSize& requestedSize, bool requestedAutoTransform); + + \internal + For future reference. +*/ + +/*! + \fn QPixmap QQuickImageProvider::requestPixmap(const QString &id, QSize *size, const QSize& requestedSize, bool requestedAutoTransform); + + \internal + For future reference. +*/ + +/*! + \fn QQuickTextureFactory *QQuickImageProvider::requestTexture(const QString &id, QSize *size, const QSize &requestedSize, bool requestedAutoTransform); + + \internal + For future reference. +*/ + QT_END_NAMESPACE diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index ef36bf51af..620d169eb4 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1121,13 +1121,18 @@ void QQuickWidget::wheelEvent(QWheelEvent *e) } #endif - +/*! + \reimp +*/ void QQuickWidget::focusInEvent(QFocusEvent * event) { Q_D(QQuickWidget); d->offscreenWindow->focusInEvent(event); } +/*! + \reimp +*/ void QQuickWidget::focusOutEvent(QFocusEvent * event) { Q_D(QQuickWidget); -- cgit v1.2.3 From 166ed1f21d7c0518350e915605869b37a4c7691b Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 2 Nov 2015 11:10:36 +0100 Subject: Fix grammar in TextInput documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I78ecd97c25da70faf8438dd02d50952d2fb80a22 Reviewed-by: Topi Reiniö --- src/quick/items/qquicktextinput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 5c67d914a5..db13a59a4e 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1373,7 +1373,7 @@ void QQuickTextInput::setInputMethodHints(Qt::InputMethodHints hints) If you set a cursorDelegate for a TextInput, this delegate will be used for drawing the cursor instead of the standard cursor. An instance of the delegate will be created and managed by the TextInput when a cursor is - needed, and the x property of delegate instance will be set so as + needed, and the x property of the delegate instance will be set so as to be one pixel before the top left of the current character. Note that the root item of the delegate component must be a QQuickItem or -- cgit v1.2.3 From 131fe1b85311b8ab02498cea5d1dda2188dcdabc Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 10 Nov 2015 10:45:51 +0100 Subject: Don't normalize the path via the shell if it is a qrc based path Passing a qrc based path to shellNormalizeFileName() was causing problems with the Windows API. Since it won't change the path in this case anyway because the path is not valid on the file system then there is no need to do any checking. Task-number: QTBUG-46248 Change-Id: If20075c25aade3740287250b4e1f31538b398f8f Reviewed-by: Lars Knoll --- src/qml/qml/qqmlengine.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 729bf8e03b..06a61c3307 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2435,6 +2435,9 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) #if defined(Q_OS_MAC) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT) const QString canonical = info.canonicalFilePath(); #elif defined(Q_OS_WIN) + // No difference if the path is qrc based + if (absolute[0] == QLatin1Char(':')) + return true; const QString canonical = shellNormalizeFileName(absolute); #endif -- cgit v1.2.3