From 8a03159c32943a7f74bbb97f6f4b7998cb8f5916 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 19 Feb 2014 09:14:07 +0100 Subject: Fix encoding of localized messages QDebug::operator<<(const char*) uses QString::fromUtf8(), while qPrintable(str) returns QString::toLocal8Bit(). This messes up e.g. the Russian translations. Task-number: QTBUG-35825 Change-Id: Ib3f0004df677196a0bd17ac48c65f2d51b833044 Reviewed-by: Oswald Buddenhagen Reviewed-by: Alan Alpert --- src/declarative/qml/qdeclarativeengine.cpp | 2 +- src/declarative/qml/qdeclarativeerror.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index a42c6a04..c7fc3865 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1942,7 +1942,7 @@ void QDeclarativeEnginePrivate::sendQuit() static void dumpwarning(const QDeclarativeError &error) { - qWarning().nospace() << qPrintable(error.toString()); + qWarning("%s", error.toString().toUtf8().constData()); } static void dumpwarning(const QList &errors) diff --git a/src/declarative/qml/qdeclarativeerror.cpp b/src/declarative/qml/qdeclarativeerror.cpp index 5ec0307d..5dbde6c6 100644 --- a/src/declarative/qml/qdeclarativeerror.cpp +++ b/src/declarative/qml/qdeclarativeerror.cpp @@ -240,7 +240,7 @@ QString QDeclarativeError::toString() const QDebug operator<<(QDebug debug, const QDeclarativeError &error) { - debug << qPrintable(error.toString()); + debug << error.toString().toUtf8().constData(); QUrl url = error.url(); -- cgit v1.2.1 From 57b34cf8dbad22a1c37bf44753d314dc22c3fc70 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 28 Feb 2014 13:05:27 +0100 Subject: Revert "Dynamic GL support in Quick1's ShaderEffectSource" Will need to change to QOpenGLContext::currentContext()->isES() once the qtbase changes are in. This reverts commit 3eeaf987123f73ad7a4745745d9e7c70f30942cd. Change-Id: I7ac8718bc07cbcbaefe1633856722ae402078112 Reviewed-by: Gunnar Sletta Reviewed-by: Friedemann Kleint --- src/imports/shaders/shadereffectsource.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index b5462c71..f58b5464 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -285,8 +285,7 @@ void ShaderEffectSource::bind() GLuint vwrap = (m_wrapMode == Repeat || m_wrapMode == RepeatVertically) ? GL_REPEAT : GL_CLAMP_TO_EDGE; #if !defined(QT_OPENGL_ES_2) - if (!QOpenGLFunctions::isES()) - glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); #endif if (m_fbo && m_fbo->isValid()) { -- cgit v1.2.1 From 9aac83d22ddbebc22fb1360d710263d349c2fdda Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 4 Mar 2014 20:25:54 +0100 Subject: Fix typos in comments and documentation Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd Reviewed-by: Mitch Curtis --- src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 +- src/declarative/qml/qdeclarativecomponent.cpp | 2 +- src/declarative/util/qdeclarativeanimation.cpp | 2 +- src/doc/src/declarative/example-slideswitch.qdoc | 2 +- src/doc/src/declarative/qdeclarativemodels.qdoc | 2 +- src/doc/src/declarative/righttoleft.qdoc | 2 +- .../uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 64ae2094..3042dc14 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1331,7 +1331,7 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b) \snippet doc/src/snippets/declarative/flickable.qml document - In some cases, the the content dimensions can be automatically set + In some cases, the content dimensions can be automatically set using the \l {Item::childrenRect.width}{childrenRect.width} and \l {Item::childrenRect.height}{childrenRect.height} properties. */ diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index f2596cc1..cbf23fa6 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -782,7 +782,7 @@ QObject *QDeclarativeComponent::create(QDeclarativeContext *context) When QDeclarativeComponent constructs an instance, it occurs in three steps: \list 1 \li The object hierarchy is created, and constant values are assigned. - \li Property bindings are evaluated for the the first time. + \li Property bindings are evaluated for the first time. \li If applicable, QDeclarativeParserStatus::componentComplete() is called on objects. \endlist QDeclarativeComponent::beginCreate() differs from QDeclarativeComponent::create() in that it diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index a72df77a..9f0c73ac 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -791,7 +791,7 @@ void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script) /*! \qmlproperty string ScriptAction::scriptName - This property holds the the name of the StateChangeScript to run. + This property holds the name of the StateChangeScript to run. This property is only valid when ScriptAction is used as part of a transition. If both script and scriptName are set, scriptName will be used. diff --git a/src/doc/src/declarative/example-slideswitch.qdoc b/src/doc/src/declarative/example-slideswitch.qdoc index b294a83a..9d115e1f 100644 --- a/src/doc/src/declarative/example-slideswitch.qdoc +++ b/src/doc/src/declarative/example-slideswitch.qdoc @@ -53,7 +53,7 @@ The elements that compose the switch are: \snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 1 This property is the interface of the switch. By default, the switch is off and this property is \c false. -It can be used to activate/disactivate the switch or to query its current state. +It can be used to activate/deactivate the switch or to query its current state. In this example: diff --git a/src/doc/src/declarative/qdeclarativemodels.qdoc b/src/doc/src/declarative/qdeclarativemodels.qdoc index 138aa3aa..a566ca88 100644 --- a/src/doc/src/declarative/qdeclarativemodels.qdoc +++ b/src/doc/src/declarative/qdeclarativemodels.qdoc @@ -269,7 +269,7 @@ with models of type QAbstractItemModel: \list \li \e hasModelChildren role property to determine whether a node has child nodes. -\li \l VisualDataModel::rootIndex allows the root node to be specifed +\li \l VisualDataModel::rootIndex allows the root node to be specified \li \l VisualDataModel::modelIndex() returns a QModelIndex which can be assigned to VisualDataModel::rootIndex \li \l VisualDataModel::parentModelIndex() returns a QModelIndex which can be assigned to VisualDataModel::rootIndex \endlist diff --git a/src/doc/src/declarative/righttoleft.qdoc b/src/doc/src/declarative/righttoleft.qdoc index 9374fa6c..604cae8d 100644 --- a/src/doc/src/declarative/righttoleft.qdoc +++ b/src/doc/src/declarative/righttoleft.qdoc @@ -60,7 +60,7 @@ aligned to the right side of the text area. The alignment of a text element with its alignment cue from \l QApplication::keyboardInputDirection(), which is based on the active system locale. -This default locale-based alignment can be overriden by setting the \c horizontalAlignment +This default locale-based alignment can be overridden by setting the \c horizontalAlignment property for the text element, or by enabling layout mirroring using the \l LayoutMirroring attached property, which causes any explicit left and right horizontal alignments to be mirrored. Note that when \l LayoutMirroring is set, the \c horizontalAlignment property value remains unchanged; diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp index 28674873..865d74b6 100644 --- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -145,7 +145,7 @@ void QmlApplicationViewer::addImportPath(const QString &path) void QmlApplicationViewer::setOrientation(ScreenOrientation orientation) { - // TODO: Needs a Qt5 implmentation + // TODO: Needs a Qt5 implementation Q_UNUSED(orientation) } -- cgit v1.2.1