aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1468 from woogerboy21/fix_old_gcc

Browse source 
Fix older gcc nested pre-def with portable builds
This commit is contained in:
woogerboy21 2015-09-05 18:01:31 -04:00
commit 15e8121cf2
1 changed files with 2 additions and 3 deletions
Show stats 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");