diff options
| author | Alexandru Croitor <[email protected]> | 2020-03-10 15:09:37 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2020-03-12 15:03:03 +0100 |
| commit | 26c5243491f495194f04b449128dae36118e28da (patch) | |
| tree | 7fb14678a6fc9e44a10c9224d005e2cbdc6bcb63 /examples/quick/customitems/painteditem | |
| parent | 1c7d264e3b2e9a2f0021786ea6967185f8282af0 (diff) | |
| parent | c24c5baeda4101b0058689adf9200b77a722c3a2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
src/qml/qml/qqmlengine.cpp
Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Diffstat (limited to 'examples/quick/customitems/painteditem')
| -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" |