mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-01 07:09:39 +00:00
Code Issues Releases Wiki Activity

Do not use deprecated Qt functions

Browse source
This commit is contained in:
Andrei Kortunov 2020-10-22 15:50:47 +04:00
parent 916c3bed98
commit 46a1950b0e
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/launcher/maindialog.cpp
View file

@ -211,10 +211,10 @@ void Launcher::MainDialog::setVersionLabel()
versionLabel->setText(tr("OpenMW development (%1)").arg(revision.left(10))); versionLabel->setText(tr("OpenMW development (%1)").arg(revision.left(10)));
// Add the compile date and time // Add the compile date and time
versionLabel->setToolTip(tr("Compiled on %1 %2").arg(QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), auto compileDate = QLocale(QLocale::C).toDate(QString(__DATE__).simplified(), QLatin1String("MMM d yyyy"));
QLatin1String("MMM d yyyy")).toString(Qt::SystemLocaleLongDate), auto compileTime = QLocale(QLocale::C).toTime(QString(__TIME__).simplified(), QLatin1String("hh:mm:ss"));
QLocale(QLocale::C).toTime(QString(__TIME__).simplified(), versionLabel->setToolTip(tr("Compiled on %1 %2").arg(QLocale::system().toString(compileDate, QLocale::LongFormat),
QLatin1String("hh:mm:ss")).toString(Qt::SystemLocaleShortDate))); QLocale::system().toString(compileTime, QLocale::ShortFormat)));
} }
bool Launcher::MainDialog::setup() bool Launcher::MainDialog::setup()

3
apps/opencs/main.cpp
View file

@ -47,9 +47,6 @@ int runApplication(int argc, char *argv[])
setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0); setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
#endif #endif
// To allow background thread drawing in OSG
QApplication::setAttribute(Qt::AA_X11InitThreads, true);
Q_INIT_RESOURCE (resources); Q_INIT_RESOURCE (resources);
qRegisterMetaType<std::string> ("std::string"); qRegisterMetaType<std::string> ("std::string");