Skip to content

Commit ddfe38c

Browse files
committed
Fix Qt compilation warnings
- Use `QImage::flipped` instead of `QImage::mirrored` on Qt >= 6.9.0. - Update loading of translations in OMNotebook.
1 parent 15c8679 commit ddfe38c

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

OMEdit/OMEditLIB/Annotations/BitmapAnnotation.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,11 @@ void BitmapAnnotation::drawAnnotation(QPainter *painter)
202202
QPointF centerPoint = rect.center() - image.rect().center();
203203
QRectF target(centerPoint.x(), centerPoint.y(), image.width(), image.height());
204204

205+
#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
206+
painter->drawImage(target, mImage.flipped())
207+
#else
205208
painter->drawImage(target, mImage.mirrored());
209+
#endif
206210
}
207211

208212
/*!

OMNotebook/OMNotebook/OMNotebookGUI/cellapplication.cpp

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,24 @@ namespace IAEX
124124
exit(1);
125125
}
126126

127-
QString translationDirectory = installationDirectoryPath + QString("/share/omnotebook/nls");
128-
// install Qt's default translations
129-
#ifdef Q_OS_WIN
130-
qtTranslator.load("qt_" + QLocale::system().name(), translationDirectory);
127+
QString locale = QLocale::system().name();
128+
129+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
130+
QString qtTranslationDirectory = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
131131
#else
132-
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
132+
QString qtTranslationDirectory = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
133133
#endif
134-
app_->installTranslator(&qtTranslator);
134+
135+
// install Qt's default translations
136+
if (qtTranslator.load("qt_" + locale, qtTranslationDirectory)) {
137+
app_->installTranslator(&qtTranslator);
138+
}
139+
140+
QString translationDirectory = installationDirectoryPath + QString("/share/omnotebook/nls");
135141
// install application translations
136-
translator.load("OMNotebook_" + QLocale::system().name(), translationDirectory);
137-
app_->installTranslator(&translator);
142+
if (translator.load("OMNotebook_" + QLocale::system().name(), translationDirectory)) {
143+
app_->installTranslator(&translator);
144+
}
138145

139146
mainWindow = new QMainWindow();
140147
QDir dir;

0 commit comments

Comments
 (0)