diff --git a/src/qrcore.cpp b/src/qrcore.cpp index 1c06399b..08c6640a 100644 --- a/src/qrcore.cpp +++ b/src/qrcore.cpp @@ -605,7 +605,8 @@ QList QRCore::getList(const QString &type, const QString &subtype) QStringList lines = flags.split("\n"); for (auto i : lines) { - if (i[0] != 0 && i[1] == 's') continue; // skip 'fs ..' + // TODO: is 0 in a string even possible? + if (i[0] != QChar(0) && i[1] == QChar('s')) continue; // skip 'fs ..' ret << i.mid(2).replace(" ", ","); } } diff --git a/src/widgets/dashboard.ui b/src/widgets/dashboard.ui index 52abebc4..b1ac922d 100644 --- a/src/widgets/dashboard.ui +++ b/src/widgets/dashboard.ui @@ -1006,7 +1006,7 @@ } QTabWidget::pane { /* The tab widget frame */ - border-top: 0px; + border-top: 0px; } QTabBar::tab { @@ -1017,8 +1017,8 @@ QTabBar::tab { border-top-right-radius: 0px; min-width: 8ex; padding: 5px; - margin-bottom: 3px; - margin-top: 3px; + margin-bottom: 3px; + margin-top: 3px; } QTabBar::tab:selected { @@ -1144,7 +1144,6 @@ QTabBar::tab:hover { - verticalSpacer_3 polarWebView diff --git a/src/widgets/importswidget.cpp b/src/widgets/importswidget.cpp index 7b878e24..785547fd 100644 --- a/src/widgets/importswidget.cpp +++ b/src/widgets/importswidget.cpp @@ -7,7 +7,7 @@ void CMyDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { - QStyleOptionViewItemV4 itemOption(option); + QStyleOptionViewItem itemOption(option); initStyleOption(&itemOption, index); itemOption.rect.adjust(10, 0, 0, 0); // Make the item rectangle 10 pixels smaller from the left side.