diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-19 01:00:06 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-19 01:00:06 +0100 |
commit | 440d699f83ab2a9676744755fd8d42c1cfeb8064 (patch) | |
tree | bb488739927eb0541b9ec668bed774a6d214e894 /examples/quick | |
parent | 872dc18e653b50c878699a78ca7cb9399cb47b62 (diff) | |
parent | d89dde522a67f6fb01f9879f45871efed5e35793 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia15cd13ed7014db80e02ba8b7e0588e3c53f832c
Diffstat (limited to 'examples/quick')
-rw-r--r-- | examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h b/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h index 972859f80e..4abf2cf3dc 100644 --- a/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h +++ b/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QQmlExtensionPlugin> +#include <QQmlEngineExtensionPlugin> #include "../textballoon.h" |