From d8de6bc398b1f2b6a666cf6360cbdb48f87295ed Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 20 Jan 2017 22:51:25 +0100 Subject: [PATCH] Fix CXPlaneUtil::xplane10Dir() on Mac OS Q_OS_UNIX is also defined on Mac OS, therefore the Q_OS_OSX branch was never reached. This concludes the test of this function on Mac OS and the todos can be removed. --- src/blackmisc/simulation/xplane/xplaneutil.cpp | 2 +- src/blackmisc/simulation/xplane/xplaneutil.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/blackmisc/simulation/xplane/xplaneutil.cpp b/src/blackmisc/simulation/xplane/xplaneutil.cpp index f358f90e2..35809ac91 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.cpp +++ b/src/blackmisc/simulation/xplane/xplaneutil.cpp @@ -87,7 +87,7 @@ namespace BlackMisc QString xplaneInstallFile = QStringLiteral("/x-plane_install_10.txt"); #if defined(Q_OS_WIN) xplaneInstallFilePath = getWindowsLocalAppDataPath() + xplaneInstallFile; -#elif defined (Q_OS_UNIX) +#elif defined (Q_OS_LINUX) xplaneInstallFilePath = QDir::homePath() + QStringLiteral("/.x-plane") + xplaneInstallFile; #elif defined (Q_OS_OSX) xplaneInstallFilePath = QDir::homePath() + QStringLiteral("/Library/Preferences") + xplaneInstallFile; diff --git a/src/blackmisc/simulation/xplane/xplaneutil.h b/src/blackmisc/simulation/xplane/xplaneutil.h index 76d9aa030..5461ab14c 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.h +++ b/src/blackmisc/simulation/xplane/xplaneutil.h @@ -30,11 +30,9 @@ namespace BlackMisc CXPlaneUtil() = delete; //! XPlane 9 directory - //! \todo Test on OSX static QString xplane9Dir(); //! XPlane 10 directory - //! \todo Test on OSX static QString xplane10Dir(); //! XPlane root directory