summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-26 08:24:01 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-26 08:24:01 +0200
commit667312695bacd560c60826a46cdb8e3d4f73d758 (patch)
treef38d425a672cd248e47f4e0dc36a0bd362bf09fd
parent9f9d5d4b157f6f992edcb5f8c20056915c7dcd7b (diff)
main: improve theme/qt plugin selection logic
-rw-r--r--facetracknoir/main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp
index 7ba0a462..45483a68 100644
--- a/facetracknoir/main.cpp
+++ b/facetracknoir/main.cpp
@@ -33,12 +33,14 @@ int main(int argc, char** argv)
{
#ifdef _WIN32
add_program_library_path();
-#endif
+#elif !defined(__linux)
// workaround QTBUG-38598
QCoreApplication::addLibraryPath(".");
+#endif
+#if defined(_WIN32) || defined(__APPLE__)
// qt5 designer-made controls look like shit on 'doze -sh 20140921
-#ifdef _WIN32
+ // also our OSX look leaves a lot to be desired -sh 20150726
{
const QStringList preferred { "fusion", "windowsvista", "jazzbands'-marijuana", "macintosh", "windowsxp" };
for (const auto& style_name : preferred)