Fixing a lot of Mac issues with the current Qt release.
This commit is contained in:
+8
-8
@@ -91,6 +91,14 @@ int main( int argc, char **argv )
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
// The following needs to be done directly after the application is created.
|
||||||
|
QDir dir(QApplication::applicationDirPath());
|
||||||
|
dir.cdUp();
|
||||||
|
dir.cd("plugins");
|
||||||
|
QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
|
||||||
|
#endif
|
||||||
|
|
||||||
//create defaultconfig
|
//create defaultconfig
|
||||||
ConfigFile *myConfig = new ConfigFile(argv[0], false);
|
ConfigFile *myConfig = new ConfigFile(argv[0], false);
|
||||||
|
|
||||||
@@ -132,14 +140,6 @@ int main( int argc, char **argv )
|
|||||||
QTranslator translator;
|
QTranslator translator;
|
||||||
translator.load(QString(myAppDataPath +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
translator.load(QString(myAppDataPath +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||||
a.installTranslator(&translator);
|
a.installTranslator(&translator);
|
||||||
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
QDir dir(QApplication::applicationDirPath());
|
|
||||||
dir.cdUp();
|
|
||||||
dir.cd("plugins");
|
|
||||||
QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
qRegisterMetaType<unsigned>("unsigned");
|
qRegisterMetaType<unsigned>("unsigned");
|
||||||
qRegisterMetaType<boost::shared_ptr<Game> >("boost::shared_ptr<Game>");
|
qRegisterMetaType<boost::shared_ptr<Game> >("boost::shared_ptr<Game>");
|
||||||
|
|||||||
Reference in New Issue
Block a user