Merge a08314a2b9
into 3a0e226597
This commit is contained in:
commit
2a611279aa
|
@ -1,5 +1,6 @@
|
|||
TEMPLATE = lib
|
||||
CONFIG += staticlib
|
||||
QT += statemachine
|
||||
SOURCES = \
|
||||
qtmaterialavatar.cpp \
|
||||
lib/qtmaterialstyle.cpp \
|
||||
|
|
|
@ -33,7 +33,7 @@ void QtMaterialTabsPrivate::QtMaterialTabsPrivate::init()
|
|||
q->setStyle(&QtMaterialStyle::instance());
|
||||
|
||||
tabLayout->setSpacing(0);
|
||||
tabLayout->setMargin(0);
|
||||
tabLayout->setContentsMargins(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
QT += core gui widgets
|
||||
QT += core gui widgets statemachine
|
||||
TEMPLATE = app
|
||||
CONFIG += c++11
|
||||
SOURCES = mainwindow.cpp \
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue