diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-16 09:44:37 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-19 12:16:24 +0000 |
commit | 64271ec2d9836d90e3aa1cea2263f89670b4ae5a (patch) | |
tree | 31160dc272d0b8157edf2aa724f256ec4606df65 /sources | |
parent | 98d337183c4f80dbcd0f12f0f0a7a58a3696526b (diff) |
Move and fix some snippets
Fix warnings:
While handling <snippet> in PySide2.QtQuick.QQuickImageProvider, line 20: Falling back to ".../qtdeclarative/examples/quick/imageprovider/imageprovider-example.qml" for "imageprovider/imageprovider-example.qml" [0]
While handling <snippet> in PySide2.QtQuick.QQuickImageProvider, line 23: Falling back to ".../qtdeclarative/examples/quick/imageprovider/imageprovider.cpp" for "imageprovider/imageprovider.cpp" [0]
While handling <snippet> in PySide2.QtQuick.QQuickImageProvider, line 25: Falling back to ".../qtdeclarative/examples/quick/imageprovider/imageprovider.cpp" for "imageprovider/imageprovider.cpp" [1]
While handling <snippet> in PySide2.QtXml.QXmlSimpleReader, line 6: Falling back to ".../qtbase/src/xml/doc/snippets/simpleparse/main.cpp" for "simpleparse/main.cpp" [0]
While handling <snippet> in PySide2.QtXml.QXmlSimpleReader, line 8: Falling back to ".../qtbase/src/xml/doc/snippets/simpleparse/main.cpp" for "simpleparse/main.cpp" [1]
While handling <snippet> in PySide2.QtXml.QXmlSimpleReader, line 11: Falling back to ".../qtbase/src/xml/doc/snippets/simpleparse/main.cpp" for "simpleparse/main.cpp" [2]
While handling <snippet> in PySide2.QtSvg.QSvgGenerator, line 5: Falling back to ".../qtsvg/examples/svg/svggenerator/window.cpp" for "svggenerator/window.cpp" [configure SVG generator]
While handling <snippet> in PySide2.QtSvg.QSvgGenerator, line 8: Falling back to ".../qtsvg/examples/svg/svggenerator/window.cpp" for "svggenerator/window.cpp" [begin painting]
While handling <snippet> in PySide2.QtSvg.QSvgGenerator, line 10: Falling back to ".../qtsvg/examples/svg/svggenerator/window.cpp" for "svggenerator/window.cpp" [end painting]
While handling <snippet> in PySide2.QtSvg.QGraphicsSvgItem, line 8: Falling back to ".../qtsvg/src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp" for "src_svg_qgraphicssvgitem.cpp" [0]
Task-number: PYSIDE-363
Change-Id: I32c73b2347e622e6594a017fde023d00bae864ec
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources')
-rw-r--r-- | sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp (renamed from sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.cpp) | 0 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.h (renamed from sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.h) | 0 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp (renamed from sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/main.cpp) | 0 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider-example.qml (renamed from sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml) | 2 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp (renamed from sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp) | 4 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/examples/quick/plugins/plugins.qml (renamed from sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp) | 0 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/examples/relationaltablemodel/relationaltablemodel.cpp (renamed from sources/pyside2/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp) | 0 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/examples/svggenerator/window.cpp (renamed from sources/pyside2/doc/codesnippets/examples/painting/svggenerator/window.cpp) | 0 |
8 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp index 6f18c7786..6f18c7786 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.h b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.h index 1d3ec1144..1d3ec1144 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.h +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.h diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp index f16891533..f16891533 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp diff --git a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider-example.qml index ad51f2e7a..fc6063e40 100644 --- a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml +++ b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider-example.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import "ImageProviderCore" // import the plugin that registers the color image provider //![0] diff --git a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp index ffbe8f564..4d1aeb74f 100644 --- a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp +++ b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp @@ -49,9 +49,9 @@ ****************************************************************************/ //![0] -class ColorImageProvider (QDeclarativeImageProvider): +class ColorImageProvider (QQuickImageProvider): def __init__(self): - QDeclarativeImageProvider.__init__(self, QDeclarativeImageProvider.Pixmap) + QQuickImageProvider.__init__(self, QDeclarativeImageProvider.Pixmap) def requestPixmap(id, size, requestedSize): width = 100 diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp b/sources/pyside2/doc/codesnippets/examples/quick/plugins/plugins.qml index df2dcbd94..df2dcbd94 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp +++ b/sources/pyside2/doc/codesnippets/examples/quick/plugins/plugins.qml diff --git a/sources/pyside2/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/sources/pyside2/doc/codesnippets/examples/relationaltablemodel/relationaltablemodel.cpp index 8df1d73b2..8df1d73b2 100644 --- a/sources/pyside2/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/sources/pyside2/doc/codesnippets/examples/relationaltablemodel/relationaltablemodel.cpp diff --git a/sources/pyside2/doc/codesnippets/examples/painting/svggenerator/window.cpp b/sources/pyside2/doc/codesnippets/examples/svggenerator/window.cpp index 60c415949..60c415949 100644 --- a/sources/pyside2/doc/codesnippets/examples/painting/svggenerator/window.cpp +++ b/sources/pyside2/doc/codesnippets/examples/svggenerator/window.cpp |