Browse Source

Build fix Qt6 ifdef

1.9.x
Syping 10 months ago
parent
commit
dd7667b9f7
  1. 12
      TranslationClass.cpp
  2. 21
      uimod/UiModWidget.cpp

12
TranslationClass.cpp

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

21
uimod/UiModWidget.cpp

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

Loading…
Cancel
Save