Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes problems with the demo and an annoying warning #443

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fixes problems with the demo and an annoying warning #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b60947
Silences an annoying warning
itay-grudev May 27, 2016
fcdf165
Added missing navigation menu icon in the demo
itay-grudev May 29, 2016
a8d1e1c
Fix Material module missing in the demo
itay-grudev May 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions demo/demo.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 1 addition & 0 deletions demo/icons/navigation_menu.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion demo/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
2 changes: 1 addition & 1 deletion src/core/units.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<QQuickItem *>(attachee);

Expand Down