Skip to content

feat: add support for Qt6 and fix compilation issues #58

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add support for Qt6 and fix compilation issues #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions components/components.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
TEMPLATE = lib
CONFIG += staticlib
QT += statemachine
SOURCES = \
qtmaterialavatar.cpp \
lib/qtmaterialstyle.cpp \
Expand Down
2 changes: 1 addition & 1 deletion components/qtmaterialtabs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void QtMaterialTabsPrivate::QtMaterialTabsPrivate::init()
q->setStyle(&QtMaterialStyle::instance());

tabLayout->setSpacing(0);
tabLayout->setMargin(0);
tabLayout->setContentsMargins(0, 0, 0, 0);
}

/*!
Expand Down
4 changes: 4 additions & 0 deletions examples/appbarsettingseditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent)
{
QLabel *label = new QLabel("Inbox");
label->setAttribute(Qt::WA_TranslucentBackground);
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
label->setForegroundRole(QPalette::WindowText);
#else
label->setForegroundRole(QPalette::Foreground);
#endif
label->setContentsMargins(6, 0, 0, 0);

QPalette palette = label->palette();
Expand Down
2 changes: 1 addition & 1 deletion examples/examples.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
QT += core gui widgets
QT += core gui widgets statemachine
TEMPLATE = app
CONFIG += c++11
SOURCES = mainwindow.cpp \
Expand Down
2 changes: 1 addition & 1 deletion examples/radiobuttonsettingseditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RadioButtonSettingsEditor::RadioButtonSettingsEditor(QWidget *parent)

layout->setAlignment(Qt::AlignCenter);

layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);

setupForm();
Expand Down
2 changes: 1 addition & 1 deletion qt-material-widgets.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets statemachine

TARGET = qt-material-widgets
TEMPLATE = subdirs
Expand Down