jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 11:38:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix older gcc nested pre-def with portable builds

Browse source
This commit is contained in:
woogerboy21 2015-09-05 17:44:51 -04:00
parent 60ed9fd1ff
commit 9dc77d674f
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/main.cpp
View file

@ -158,13 +158,12 @@ int main(int argc, char *argv[])
#ifdef PORTABLE_BUILD #ifdef PORTABLE_BUILD
const QString dataDir = "data/"; const QString dataDir = "data/";
#else #elif QT_VERSION < 0x050000
#if QT_VERSION < 0x050000
const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
#else #else
const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first(); const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
#endif #endif
#endif
if (!db->getLoadSuccess()) if (!db->getLoadSuccess())
if (!db->loadCardDatabase(dataDir + "/cards.xml")) if (!db->loadCardDatabase(dataDir + "/cards.xml"))
settingsCache->setCardDatabasePath(dataDir + "/cards.xml"); settingsCache->setCardDatabasePath(dataDir + "/cards.xml");