Syping/gta5view
1
0
Fork 0
Code Issues Pull requests Releases 12 Wiki Activity

Build fix Qt6 ifdef
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Syping 2021-01-10 01:33:18 +01:00
parent 7adf8f2c90
commit dd7667b9f7
2 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
TranslationClass.cpp
View file

@ -63,7 +63,7 @@ void TranslationClass::loadTranslation(QApplication *app)
{ {
app->installTranslator(&inQtTranslator); app->installTranslator(&inQtTranslator);
} }
#if QT_VERSION <= 0x060000 #if QT_VERSION >= 0x060000
QLocale::setDefault(QLocale(currentLanguage)); QLocale::setDefault(QLocale(currentLanguage));
#else #else
QLocale::setDefault(currentLanguage); QLocale::setDefault(currentLanguage);
@ -151,7 +151,7 @@ void TranslationClass::loadTranslation(QApplication *app)
{ {
app->installTranslator(&inQtTranslator); app->installTranslator(&inQtTranslator);
} }
#if QT_VERSION <= 0x060000 #if QT_VERSION >= 0x060000
QLocale::setDefault(QLocale(currentLanguage)); QLocale::setDefault(QLocale(currentLanguage));
#else #else
QLocale::setDefault(currentLanguage); QLocale::setDefault(currentLanguage);
@ -184,7 +184,7 @@ void TranslationClass::loadTranslation(QApplication *app)
{ {
app->installTranslator(&inQtTranslator); app->installTranslator(&inQtTranslator);
} }
#if QT_VERSION <= 0x060000 #if QT_VERSION >= 0x060000
QLocale::setDefault(QLocale(currentLanguage)); QLocale::setDefault(QLocale(currentLanguage));
#else #else
QLocale::setDefault(currentLanguage); QLocale::setDefault(currentLanguage);
@ -207,7 +207,7 @@ void TranslationClass::loadTranslation(QApplication *app)
{ {
app->installTranslator(&inQtTranslator); app->installTranslator(&inQtTranslator);
} }
#if QT_VERSION <= 0x060000 #if QT_VERSION >= 0x060000
QLocale::setDefault(QLocale(currentLanguage)); QLocale::setDefault(QLocale(currentLanguage));
#else #else
QLocale::setDefault(currentLanguage); QLocale::setDefault(currentLanguage);
@ -235,7 +235,7 @@ void TranslationClass::loadTranslation(QApplication *app)
{ {
app->installTranslator(&inQtTranslator); app->installTranslator(&inQtTranslator);
} }
#if QT_VERSION <= 0x060000 #if QT_VERSION >= 0x060000
QLocale::setDefault(QLocale(currentLanguage)); QLocale::setDefault(QLocale(currentLanguage));
#else #else
QLocale::setDefault(currentLanguage); QLocale::setDefault(currentLanguage);
@ -256,7 +256,7 @@ void TranslationClass::loadTranslation(QApplication *app)
{ {
app->installTranslator(&inQtTranslator); app->installTranslator(&inQtTranslator);
} }
#if QT_VERSION <= 0x060000 #if QT_VERSION >= 0x060000
QLocale::setDefault(QLocale(currentLanguage)); QLocale::setDefault(QLocale(currentLanguage));
#else #else
QLocale::setDefault(currentLanguage); QLocale::setDefault(currentLanguage);

21
uimod/UiModWidget.cpp
View file

@ -46,26 +46,21 @@ void UiModWidget::setImageDropEnabled(bool enabled)
void UiModWidget::dragEnterEvent(QDragEnterEvent *dragEnterEvent) void UiModWidget::dragEnterEvent(QDragEnterEvent *dragEnterEvent)
{ {
if (filesDropEnabled && dragEnterEvent->mimeData()->hasUrls()) if (filesDropEnabled && dragEnterEvent->mimeData()->hasUrls()) {
{ QVector<QString> pathList;
QStringList pathList;
const QList<QUrl> urlList = dragEnterEvent->mimeData()->urls(); const QList<QUrl> urlList = dragEnterEvent->mimeData()->urls();
for (const QUrl &currentUrl : urlList) for (const QUrl &currentUrl : urlList) {
{ if (currentUrl.isLocalFile()) {
if (currentUrl.isLocalFile())
{
pathList.append(currentUrl.toLocalFile()); pathList.append(currentUrl.toLocalFile());
} }
} }
if (!pathList.isEmpty()) if (!pathList.isEmpty()) {
{
dragEnterEvent->acceptProposedAction(); dragEnterEvent->acceptProposedAction();
} }
} }
else if (imageDropEnabled && dragEnterEvent->mimeData()->hasImage()) else if (imageDropEnabled && dragEnterEvent->mimeData()->hasImage()) {
{
dragEnterEvent->acceptProposedAction(); dragEnterEvent->acceptProposedAction();
} }
} }
@ -80,11 +75,7 @@ void UiModWidget::paintEvent(QPaintEvent *paintEvent)
{ {
Q_UNUSED(paintEvent) Q_UNUSED(paintEvent)
QStyleOption opt; QStyleOption opt;
#if QT_VERSION <= 0x060000
opt.initFrom(this); opt.initFrom(this);
#else
opt.init(this);
#endif
QPainter p(this); QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
} }