Changeset View
Changeset View
Standalone View
Standalone View
src/lib/marble/MarbleDirs.cpp
Context not available. | |||||
30 | #include <shlobj.h> | 30 | #include <shlobj.h> | ||
---|---|---|---|---|---|
31 | #endif | 31 | #endif | ||
32 | 32 | | |||
33 | #ifdef Q_OS_MACX | 33 | #ifdef APPLE_STANDALONE_BUNDLE | ||
34 | //for getting app bundle path | 34 | //for getting app bundle path | ||
35 | #include <ApplicationServices/ApplicationServices.h> | 35 | #include <ApplicationServices/ApplicationServices.h> | ||
36 | #endif | 36 | #endif | ||
Context not available. | |||||
131 | return QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("data"); | 131 | return QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("data"); | ||
132 | #endif | 132 | #endif | ||
133 | 133 | | |||
134 | #ifdef Q_OS_MACX | 134 | #ifdef APPLE_STANDALONE_BUNDLE | ||
135 | // | 135 | // | ||
136 | // On OSX lets try to find any file first in the bundle | 136 | // On OSX lets try to find any file first in the bundle | ||
137 | // before branching out to home and sys dirs | 137 | // before branching out to home and sys dirs | ||
Context not available. | |||||
144 | CFRelease(myMacPath); | 144 | CFRelease(myMacPath); | ||
145 | //do some magick so that we can still find data dir if | 145 | //do some magick so that we can still find data dir if | ||
146 | //marble was not built as a bundle | 146 | //marble was not built as a bundle | ||
147 | if (myPath.contains(QLatin1String(".app"))) { //its a bundle! | 147 | if (myPath.contains(QLatin1String(".app"))) { //it's a bundle! | ||
148 | systempath = myPath + QLatin1String("/Contents/Resources/data"); | 148 | systempath = myPath + QLatin1String("/Contents/Resources"); | ||
149 | } | 149 | } | ||
150 | 150 | | |||
151 | if ( QFile::exists( systempath ) ){ | 151 | if ( QFile::exists( systempath ) ){ | ||
Context not available. | |||||
185 | 185 | | |||
186 | QString systempath; | 186 | QString systempath; | ||
187 | 187 | | |||
188 | #ifdef Q_OS_MACX | 188 | #ifdef APPLE_STANDALONE_BUNDLE | ||
189 | // | 189 | // | ||
190 | // On OSX lets try to find any file first in the bundle | 190 | // On OSX lets try to find any file first in the bundle | ||
191 | // before branching out to home and sys dirs | 191 | // before branching out to home and sys dirs | ||
Context not available. |