Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Engine/FileSystemModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ FileSystemModel::data(const QModelIndex &index,
data = item->fileExtension();
break;
case DateModified:
data = item->getLastModified().toString(Qt::LocalDate);
data = QLocale().toString(item->getLastModified(), QLocale::ShortFormat);
break;
default:
break;
Expand Down
4 changes: 2 additions & 2 deletions Engine/StandardPaths.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ load(const wchar_t *libraryName,
// This code is windows-only anyway, but this is here for consistency with other parts of the source
const QChar pathSep = QChar::fromLatin1(':');
# endif
searchOrder << PATH.split(pathSep, QString::SkipEmptyParts);
searchOrder << PATH.split(pathSep, Qt::SkipEmptyParts);
}
QString fileName = QString::fromWCharArray(libraryName);
fileName.append( QLatin1String(".dll") );
Expand Down Expand Up @@ -317,7 +317,7 @@ StandardPaths::writableLocation(StandardLocationEnum type)
path = QStandardPaths::HomeLocation;
break;
case StandardPaths::eStandardLocationData:
path = QStandardPaths::DataLocation;
path = QStandardPaths::AppLocalDataLocation;
break;
case StandardPaths::eStandardLocationCache:
path = QStandardPaths::CacheLocation;
Expand Down
2 changes: 1 addition & 1 deletion Gui/KnobGuiFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ KnobGuiFile::updateGUI(int /*dimension*/)

QString tt = toolTip();
tt.append( QString::fromUtf8("\n\nLast modified: ") );
tt.append( dateTime.toString(Qt::SystemLocaleShortDate) );
tt.append( QLocale().toString(dateTime, QLocale::ShortFormat));
_lineEdit->setToolTip(tt);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Gui/NodeViewerContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ addSpacer(QBoxLayout* layout)
line->setFrameShape(QFrame::VLine);
line->setFrameShadow(QFrame::Raised);
QPalette palette;
palette.setColor(QPalette::Foreground, Qt::black);
palette.setColor(QPalette::WindowText, Qt::black);
line->setPalette(palette);
layout->addWidget(line);
layout->addSpacing( TO_DPIX(5) );
Expand Down
2 changes: 1 addition & 1 deletion Gui/QtColorTriangle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void QtColorTriangle::genBackground()
// Create an image of the same size as the contents rect.
bg = QImage(contentsRect().size(), QImage::Format_RGB32);
QPainter p(&bg);
p.setRenderHint(QPainter::HighQualityAntialiasing);
p.setRenderHint(QPainter::Antialiasing);
p.fillRect(bg.rect(), palette().mid());

QConicalGradient gradient(bg.rect().center(), 90);
Expand Down
8 changes: 4 additions & 4 deletions Gui/TableModelView.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ class TableItem

inline QColor backgroundColor() const
{
return qvariant_cast<QColor>( data(Qt::BackgroundColorRole) );
return qvariant_cast<QColor>( data(Qt::BackgroundRole) );
}

inline void setBackgroundColor(const QColor &color)
{
setData(Qt::BackgroundColorRole, color);
setData(Qt::BackgroundRole, color);
}

inline QBrush background() const
Expand All @@ -179,12 +179,12 @@ class TableItem

inline QColor textColor() const
{
return qvariant_cast<QColor>( data(Qt::TextColorRole) );
return qvariant_cast<QColor>( data(Qt::ForegroundRole) );
}

inline void setTextColor(const QColor &color)
{
setData(Qt::TextColorRole, color);
setData(Qt::ForegroundRole, color);
}

inline QBrush foreground() const
Expand Down
2 changes: 1 addition & 1 deletion Gui/TextRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ TextRendererPrivate::createCharacter(QChar c)
image.fill(Qt::transparent);
QPainter painter;
painter.begin(&image);
painter.setRenderHints(QPainter::HighQualityAntialiasing
painter.setRenderHints(QPainter::Antialiasing
| QPainter::TextAntialiasing);
painter.setFont(_font);
painter.setPen(Qt::white);
Expand Down
2 changes: 1 addition & 1 deletion Gui/ViewerTab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ addSpacer(QBoxLayout* layout)
line->setFrameShadow(QFrame::Raised);
//line->setObjectName("LayoutSeparator");
QPalette palette;
palette.setColor(QPalette::Foreground, Qt::black);
palette.setColor(QPalette::WindowText, Qt::black);
line->setPalette(palette);
layout->addWidget(line);
layout->addSpacing(5);
Expand Down