From e7d9df8d593534c5e25df1ecba7281ccacae7671 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 9 Jan 2018 12:38:03 +0100 Subject: Palette: fix value type provider The static value type provider instance must be moved from the plugin (libqtquicktemplates2plugin.so) to the library (libQt5QuickTemplates2.so) to keep it alive when qmlClearTypeRegistrations() is called and the plugin is unloaded. This fixes the warning that was being thrown a lot in tst_qquickmenubar on macOS: QWARN : tst_qquickmenubar::Default::UnknownTestFunc() QQml_removeValueTypeProvider: was asked to remove provider 0x117dc97f8 but it was not found Change-Id: I4448e497672c834786af0132b6ed5f03c3931773 Reviewed-by: Mitch Curtis --- src/quicktemplates2/quicktemplates2.pri | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/quicktemplates2/quicktemplates2.pri') diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri index ee51f995..b2193ec0 100644 --- a/src/quicktemplates2/quicktemplates2.pri +++ b/src/quicktemplates2/quicktemplates2.pri @@ -50,6 +50,7 @@ HEADERS += \ $$PWD/qquickpageindicator_p.h \ $$PWD/qquickpagelayout_p_p.h \ $$PWD/qquickpalette_p.h \ + $$PWD/qquickpaletteprovider_p.h \ $$PWD/qquickpane_p.h \ $$PWD/qquickpane_p_p.h \ $$PWD/qquickpopup_p.h \ @@ -125,6 +126,7 @@ SOURCES += \ $$PWD/qquickpageindicator.cpp \ $$PWD/qquickpagelayout.cpp \ $$PWD/qquickpalette.cpp \ + $$PWD/qquickpaletteprovider.cpp \ $$PWD/qquickpane.cpp \ $$PWD/qquickpopup.cpp \ $$PWD/qquickpopupitem.cpp \ -- cgit v1.2.3