diff --git a/demo/demo.pro b/demo/demo.pro index dae52407..058218e4 100644 --- a/demo/demo.pro +++ b/demo/demo.pro @@ -4,3 +4,8 @@ QT += qml quick SOURCES += main.cpp RESOURCES += demo.qrc icons/icons.qrc + +# Include qml-material +OPTIONS += roboto +DEFINES += QPM_INIT +include(../material.pri) diff --git a/demo/icons/navigation_menu.svg b/demo/icons/navigation_menu.svg new file mode 100644 index 00000000..6c9b6bf9 --- /dev/null +++ b/demo/icons/navigation_menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/demo/main.cpp b/demo/main.cpp index d1e6dc06..3e1b3113 100644 --- a/demo/main.cpp +++ b/demo/main.cpp @@ -5,7 +5,9 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - QQmlApplicationEngine engine(QUrl(QStringLiteral("qrc:/main.qml"))); + QQmlApplicationEngine engine; + engine.addImportPath( "qrc:///" ); + engine.load( QUrl( QStringLiteral( "qrc:/main.qml" ) ) ); return app.exec(); } diff --git a/src/core/units.cpp b/src/core/units.cpp index 21557180..015a6434 100644 --- a/src/core/units.cpp +++ b/src/core/units.cpp @@ -20,7 +20,7 @@ #define DEFAULT_DPI 72 UnitsAttached::UnitsAttached(QObject *attachee) - : QObject(attachee), m_screen(nullptr), m_window(nullptr), m_multiplier(1), m_dpi(0) + : QObject(attachee), m_screen(nullptr), m_window(nullptr), m_dpi(0), m_multiplier(1) { m_attachee = qobject_cast(attachee);