diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /examples/quick/imageprovider/imageprovider.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'examples/quick/imageprovider/imageprovider.cpp')
| -rw-r--r-- | examples/quick/imageprovider/imageprovider.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/examples/quick/imageprovider/imageprovider.cpp b/examples/quick/imageprovider/imageprovider.cpp index 662bd8bb70..2d927ea79a 100644 --- a/examples/quick/imageprovider/imageprovider.cpp +++ b/examples/quick/imageprovider/imageprovider.cpp @@ -56,7 +56,6 @@ #include <QImage> #include <QPainter> -//![0] class ColorImageProvider : public QQuickImageProvider { public: @@ -75,7 +74,6 @@ public: QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : width, requestedSize.height() > 0 ? requestedSize.height() : height); pixmap.fill(QColor(id).rgba()); -//![0] // write the color name QPainter painter(&pixmap); @@ -87,11 +85,9 @@ public: painter.scale(requestedSize.width() / width, requestedSize.height() / height); painter.drawText(QRectF(0, 0, width, height), Qt::AlignCenter, id); -//![1] return pixmap; } }; -//![1] class ImageProviderExtensionPlugin : public QQmlExtensionPlugin |