mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-26 09:48:45 -05:00
Merge pull request #1447 from pinkavaj/pi-depr6
Replace deprecated Qt font and layout functions
This commit is contained in:
commit
180c840633
@ -92,7 +92,7 @@ void ScaleEngine::calcCharSize()
|
||||
float size;
|
||||
float max = 0.0f;
|
||||
for(i = 0; i < str.length(); i++) {
|
||||
size = fontMetrics.width(QString(str[i]));
|
||||
size = fontMetrics.horizontalAdvance(QString(str[i]));
|
||||
if(size > max)
|
||||
max = size;
|
||||
}
|
||||
|
@ -56,7 +56,7 @@ Workspace::Workspace(int index, QWidget *parent, Qt::WindowFlags flags) :
|
||||
|
||||
m_titleBar = new QWidget();
|
||||
m_titleBarLayout = new QHBoxLayout();
|
||||
m_titleBarLayout->setMargin(0);
|
||||
m_titleBarLayout->setContentsMargins(QMargins());
|
||||
m_titleBar->setLayout(m_titleBarLayout);
|
||||
|
||||
m_titleLabel = new QLabel();
|
||||
|
Loading…
Reference in New Issue
Block a user