Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
9dc77d67
Commit
9dc77d67
authored
Sep 05, 2015
by
woogerboy21
Browse files
Fix older gcc nested pre-def with portable builds
parent
60ed9fd1
Changes
1
Show whitespace changes
Inline
Side-by-side
cockatrice/src/main.cpp
View file @
9dc77d67
...
...
@@ -158,13 +158,12 @@ int main(int argc, char *argv[])
#ifdef PORTABLE_BUILD
const
QString
dataDir
=
"data/"
;
#else
#if QT_VERSION < 0x050000
#elif QT_VERSION < 0x050000
const
QString
dataDir
=
QDesktopServices
::
storageLocation
(
QDesktopServices
::
DataLocation
);
#else
const
QString
dataDir
=
QStandardPaths
::
standardLocations
(
QStandardPaths
::
DataLocation
).
first
();
#endif
#endif
if
(
!
db
->
getLoadSuccess
())
if
(
!
db
->
loadCardDatabase
(
dataDir
+
"/cards.xml"
))
settingsCache
->
setCardDatabasePath
(
dataDir
+
"/cards.xml"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment