summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-02 06:28:13 -0800
committerPetr Mrázek <peterix@gmail.com>2014-01-02 06:28:13 -0800
commitaed3ddda2950f00f2e1a884f1b7f31b7c4780ae5 (patch)
tree22bc686b7fbd4c3b32a52d4a14c00d00b0f55f1d
parenteb4e7d3f6771d5c5fb6d70557c8013f745e72ca4 (diff)
parent1bdac97af51b77ddcf4934752c2a7d0704c8f7be (diff)
downloadMultiMC-aed3ddda2950f00f2e1a884f1b7f31b7c4780ae5.tar
MultiMC-aed3ddda2950f00f2e1a884f1b7f31b7c4780ae5.tar.gz
MultiMC-aed3ddda2950f00f2e1a884f1b7f31b7c4780ae5.tar.lz
MultiMC-aed3ddda2950f00f2e1a884f1b7f31b7c4780ae5.tar.xz
MultiMC-aed3ddda2950f00f2e1a884f1b7f31b7c4780ae5.zip
Merge pull request #30 from max96at/feature_osx_polish
Fixed buttons on osx and added .DS_Store to the gitignore file.
-rw-r--r--.gitignore2
-rw-r--r--CMakeLists.txt12
2 files changed, 14 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a58d38f3..54bd5039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ tags
# YouCompleteMe config stuff.
.ycm_extra_conf.*
+#OSX Stuff
+.DS_Store
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39ff15c0..ab04c280 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -612,6 +612,18 @@ INSTALL(
REGEX "d\\." EXCLUDE
REGEX "_debug\\." EXCLUDE
)
+IF(APPLE)
+ # Accessible plugin to make buttons look decent on osx
+ INSTALL(
+ DIRECTORY "${QT_PLUGINS_DIR}/accessible"
+ DESTINATION ${PLUGIN_DEST_DIR}
+ COMPONENT Runtime
+ REGEX "quick" EXCLUDE
+ REGEX "d\\." EXCLUDE
+ REGEX "_debug\\." EXCLUDE
+ )
+ENDIF()
+
endif()
# qtconf