From a0667e93d039451e80af646faa5008d27b78f85b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 18 Jul 2015 01:52:51 +0200 Subject: initial version of macosx bundle script --- macosx/make-app-bundle.sh | 35 ++++++++++++++++++++++++++++++++ macosx/opentrack.app/Contents/Info.plist | 26 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 macosx/make-app-bundle.sh create mode 100644 macosx/opentrack.app/Contents/Info.plist (limited to 'macosx') diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh new file mode 100644 index 00000000..390f7af1 --- /dev/null +++ b/macosx/make-app-bundle.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +APPNAME=opentrack + +dir="$1" +test -n "$dir" || exit 1 +install="$1" +test -n "$install" || exit 1 +output_dir="$3" +test -n "$output_dir" || exit 1 +version="$4" +test -n "$version" || exit 1 + +tmp="$(mktemp -d "/tmp/$APPNAME-tmp.XXXXXXX")" +test $? -eq 0 || exit 1 + +cp -R "$dir/opentrack.app" "$tmp" || exit 1 +cp -R "$install/"* "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 +sed -i -e "s#@OPENTRACK-VERSION@#$version#g" "$tmp/$APPNAME.app/Contents/Info.plist" || exit 1 + +rm -rf "$tmp/$APPNAME.iconset" +mkdir "$tmp/$APPNAME.iconset" + +sips -z 16 16 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1 +sips -z 32 32 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1 +sips -z 32 32 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1 +sips -z 64 64 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1 +sips -z 128 128 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || exit 1 + +iconutil -c icns -o "$tmp/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$APPNAME.iconset" +rm -r "$tmp/$APPNAME.iconset" + +cd "$tmp" || exit 1 +zip -9 "$output_dir/$APPNAME-$version.zip" "$APPNAME.app" || exit 1 +ls -lh "$output_dir/$APPNAME-$version.zip" \ No newline at end of file diff --git a/macosx/opentrack.app/Contents/Info.plist b/macosx/opentrack.app/Contents/Info.plist new file mode 100644 index 00000000..60791ba9 --- /dev/null +++ b/macosx/opentrack.app/Contents/Info.plist @@ -0,0 +1,26 @@ + +!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> + + + CFBundleGetInfoString + @OPENTRACK-VERSION@ + CFBundleExecutable + opentrack.bin + CFBundleIdentifier + com.github.opentrack + CFBundleName + opentrack + CFBundleIconFile + opentrack.icns + CFBundleShortVersionString + 0.01 + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + IFMajorVersion + 0 + IFMinorVersion + 1 + + \ No newline at end of file -- cgit v1.2.3 From 84044ec3f6fe9ea90f3601b880d96be989fb7d79 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 19 Jul 2015 11:11:13 +0200 Subject: fix osx, app bundle now builds --- CMakeLists.txt | 24 ++++++++++----------- ftnoir_filter_accela/ftnoir_filter_accela.cpp | 6 ++++++ ftnoir_filter_kalman/kalman.cpp | 2 ++ .../opentrack-wrapper-wine-main.cxx | 4 ++++ ftnoir_protocol_wine/wine-shm.h | 5 +++++ install-fail-tool | 19 ---------------- macosx/install-fail-tool | 25 ++++++++++++++++++++++ macosx/make-app-bundle.sh | 22 ++++++++++++------- macosx/opentrack.app/Contents/Info.plist | 20 ++++++++--------- macosx/opentrack.app/Contents/PkgInfo | 1 + macosx/qt.conf | 2 ++ opentrack/simple-mat.hpp | 4 ++-- pose-widget/glwidget.cpp | 4 ++-- qfunctionconfigurator/functionconfig.cpp | 3 ++- 14 files changed, 86 insertions(+), 55 deletions(-) delete mode 100755 install-fail-tool create mode 100755 macosx/install-fail-tool create mode 100644 macosx/opentrack.app/Contents/PkgInfo create mode 100644 macosx/qt.conf (limited to 'macosx') diff --git a/CMakeLists.txt b/CMakeLists.txt index ece3165b..b74ec7f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,11 +61,13 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE) endif() if(APPLE) + set(CMAKE_MACOSX_RPATH OFF) set(apple-frameworks "-stdlib=libc++ -framework Cocoa -framework CoreFoundation -lobjc -lz -framework Carbon") set(CMAKE_SHARED_LINKER_FLAGS " ${apple-frameworks} ${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS " ${apple-frameworks} ${CMAKE_STATIC_LINKER_FLAGS}") + #set(CMAKE_STATIC_LINKER_FLAGS " ${apple-frameworks} ${CMAKE_STATIC_LINKER_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS " ${apple-frameworks} ${CMAKE_EXE_LINKER_FLAGS}") set(CMAKE_MODULE_LINKER_FLAGS " ${apple-frameworks} ${CMAKE_MODULE_LINKER_FLAGS}") + set(CMAKE_CXX_FLAGS " -stdlib=libc++ ${CMAKE_CXX_FLAGS}") endif() if(CMAKE_COMPILER_IS_GNUCXX OR APPLE) @@ -340,11 +342,9 @@ if(SDK_WINE_PREFIX) add_custom_command( OUTPUT opentrack-wrapper-wine.exe.so DEPENDS ${wine-deps} - COMMAND ${SDK_WINE_PREFIX}/bin/wineg++ -g -O2 -m32 -std=c++11 -o + COMMAND ${SDK_WINE_PREFIX}/bin/wineg++ -g -DNOMINMAX -O2 -m32 -std=c++11 -o opentrack-wrapper-wine.exe -I "${CMAKE_SOURCE_DIR}" - ${CMAKE_SOURCE_DIR}/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx - ${CMAKE_SOURCE_DIR}/ftnoir_protocol_wine/opentrack-wrapper-wine-posix.cxx - ${CMAKE_SOURCE_DIR}/ftnoir_protocol_wine/opentrack-wrapper-wine-windows.cxx + ${wine-deps} ${my-rt}) add_custom_target(wine-wrapper ALL DEPENDS opentrack-wrapper-wine.exe.so) add_dependencies(opentrack-proto-wine wine-wrapper) @@ -352,13 +352,6 @@ if(SDK_WINE_PREFIX) endif() endif() -if(APPLE) - install(CODE " -execute_process(COMMAND /bin/sh \"\${CMAKE_SOURCE_DIR}/macosx/make-app-bundle.sh\" - \"\${CMAKE_SOURCE_DIR}/macosx\" \"\${CMAKE_INSTALL_PREFIX}\" \"\${CMAKE_BUILD_DIR}\" \"\${OPENTRACK__COMMIT}\") -") -endif() - opentrack_library(opentrack-tracker-udp ftnoir_tracker_udp) opentrack_library(opentrack-tracker-freepie-udp ftnoir_tracker_freepie-udp) @@ -552,7 +545,12 @@ endif() install(DIRECTORY "${CMAKE_SOURCE_DIR}/bin/camera" DESTINATION .) if(APPLE) + install(FILES "${CMAKE_SOURCE_DIR}/macosx/qt.conf" DESTINATION .) install(CODE " - execute_process(COMMAND /bin/sh \"${CMAKE_SOURCE_DIR}/install-fail-tool\" \"${CMAKE_INSTALL_PREFIX}\") + execute_process(COMMAND /bin/sh \"${CMAKE_SOURCE_DIR}/macosx/make-app-bundle.sh\" + \"${CMAKE_SOURCE_DIR}/macosx\" + \"${CMAKE_INSTALL_PREFIX}\" + \"${CMAKE_BINARY_DIR}\" + \"${OPENTRACK__COMMIT}\") ") endif() diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp index c4b329e1..f8bd2ab1 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp @@ -37,6 +37,12 @@ static constexpr double trans_gains[][2] = { { -1, 0 } }; +constexpr double settings_accela::mult_rot; +constexpr double settings_accela::mult_trans; +constexpr double settings_accela::mult_rot_dz; +constexpr double settings_accela::mult_trans_dz; +constexpr double settings_accela::mult_ewma; + FTNoIR_Filter::FTNoIR_Filter() : first_run(true) { rot.setMaxInput(rot_gains[0][0]); diff --git a/ftnoir_filter_kalman/kalman.cpp b/ftnoir_filter_kalman/kalman.cpp index f0b9e261..39a08703 100644 --- a/ftnoir_filter_kalman/kalman.cpp +++ b/ftnoir_filter_kalman/kalman.cpp @@ -9,6 +9,8 @@ #include #include +constexpr double settings::mult_noise_stddev; + FTNoIR_Filter::FTNoIR_Filter() { reset(); prev_slider_pos = s.noise_stddev_slider; diff --git a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx index 78fa549b..026135f0 100644 --- a/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx +++ b/ftnoir_protocol_wine/opentrack-wrapper-wine-main.cxx @@ -1,4 +1,8 @@ #include +// OSX sdk 10.8 build error otherwise +#ifdef _LIBCPP_MSVCRT +# undef _LIBCPP_MSVCRT +#endif #include #include "freetrackclient/fttypes.h" #include "ftnoir_protocol_wine/wine-shm.h" diff --git a/ftnoir_protocol_wine/wine-shm.h b/ftnoir_protocol_wine/wine-shm.h index c0f29cd3..c7e29abb 100644 --- a/ftnoir_protocol_wine/wine-shm.h +++ b/ftnoir_protocol_wine/wine-shm.h @@ -3,6 +3,11 @@ #define WINE_SHM_NAME "facetracknoir-wine-shm" #define WINE_MTX_NAME "facetracknoir-wine-mtx" +// OSX sdk 10.8 build error otherwise +#ifdef _LIBCPP_MSVCRT +# undef _LIBCPP_MSVCRT +#endif + #include template using ptr = std::shared_ptr; diff --git a/install-fail-tool b/install-fail-tool deleted file mode 100755 index 99f8fbdf..00000000 --- a/install-fail-tool +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -test -n "$1" || exit 1 - -dir="$1" - -for i in "$dir"/* "$dir"/*/*; do - { test -x "$i" && test -f "$i"; } || continue - echo ---- $i ---- - install_name_tool -id "@executable_path/$(basename -- "$i")" "$i" - - otool -L "$i" | awk '{ print $1 }' | - while read l; do - j="$(basename -- "$l")" - if test -e "$dir/$j"; then - install_name_tool -change "$l" "@executable_path/$j" "$i" - fi - done -done diff --git a/macosx/install-fail-tool b/macosx/install-fail-tool new file mode 100755 index 00000000..0f34c3a1 --- /dev/null +++ b/macosx/install-fail-tool @@ -0,0 +1,25 @@ +#!/bin/sh + +test -n "$1" || exit 1 + +dir="$1" + +for i in "$dir"/* "$dir"/*/*; do + { test -x "$i" && test -f "$i"; } || continue + case "$i" in + *.dll|*.exe) continue ;; + *) : ;; + esac + case "$i" in + *.dylib|*.bin) strip -x "$i" ;; esac + echo ---- $i ---- + install_name_tool -id "@executable_path/$(basename -- "$i")" "$i" + + otool -L "$i" | awk '{ print $1 }' | + while read l; do + j="$(basename -- "$l")" + if test -e "$dir/$j"; then + install_name_tool -change "$l" "@executable_path/$j" "$i" + fi + done +done diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index 390f7af1..7e79d6db 100644 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -4,7 +4,7 @@ APPNAME=opentrack dir="$1" test -n "$dir" || exit 1 -install="$1" +install="$2" test -n "$install" || exit 1 output_dir="$3" test -n "$output_dir" || exit 1 @@ -14,12 +14,16 @@ test -n "$version" || exit 1 tmp="$(mktemp -d "/tmp/$APPNAME-tmp.XXXXXXX")" test $? -eq 0 || exit 1 -cp -R "$dir/opentrack.app" "$tmp" || exit 1 -cp -R "$install/"* "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 -sed -i -e "s#@OPENTRACK-VERSION@#$version#g" "$tmp/$APPNAME.app/Contents/Info.plist" || exit 1 +"$dir/install-fail-tool" "$install" -rm -rf "$tmp/$APPNAME.iconset" -mkdir "$tmp/$APPNAME.iconset" +cp -R "$dir/opentrack.app" "$tmp/" || exit 1 +cp -R "$install" "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 +sed -i '' -e "s#@OPENTRACK-VERSION@#$version#g" "$tmp/$APPNAME.app/Contents/Info.plist" || exit 1 + +#cp "$dir/qt.conf" "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 + +mkdir "$tmp/$APPNAME.iconset" || exit 1 +mkdir "$tmp/$APPNAME.app/Contents/Resources" || exit 1 sips -z 16 16 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1 sips -z 32 32 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1 @@ -31,5 +35,7 @@ iconutil -c icns -o "$tmp/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$ rm -r "$tmp/$APPNAME.iconset" cd "$tmp" || exit 1 -zip -9 "$output_dir/$APPNAME-$version.zip" "$APPNAME.app" || exit 1 -ls -lh "$output_dir/$APPNAME-$version.zip" \ No newline at end of file +rm -f "$output_dir/$APPNAME-$version.zip" +zip -9r "$output_dir/$APPNAME-$version.zip" "$APPNAME.app" || exit 1 +rm -rf "$tmp" +ls -lh "$output_dir/$APPNAME-$version.zip" diff --git a/macosx/opentrack.app/Contents/Info.plist b/macosx/opentrack.app/Contents/Info.plist index 60791ba9..ed4b0b05 100644 --- a/macosx/opentrack.app/Contents/Info.plist +++ b/macosx/opentrack.app/Contents/Info.plist @@ -1,9 +1,9 @@ -!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> + - CFBundleGetInfoString - @OPENTRACK-VERSION@ + CFBundleDevelopmentRegion + en CFBundleExecutable opentrack.bin CFBundleIdentifier @@ -12,15 +12,15 @@ opentrack CFBundleIconFile opentrack.icns - CFBundleShortVersionString - 0.01 + CFBundleVersion + @OPENTRACK-VERSION@ CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType APPL - IFMajorVersion - 0 - IFMinorVersion - 1 + CFBundleDisplayName + opentrack + CFBundleSignature + ???? - \ No newline at end of file + diff --git a/macosx/opentrack.app/Contents/PkgInfo b/macosx/opentrack.app/Contents/PkgInfo new file mode 100644 index 00000000..b18f8c6c --- /dev/null +++ b/macosx/opentrack.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPLopentrack diff --git a/macosx/qt.conf b/macosx/qt.conf new file mode 100644 index 00000000..e69f24eb --- /dev/null +++ b/macosx/qt.conf @@ -0,0 +1,2 @@ +[Paths] +Plugins = . diff --git a/opentrack/simple-mat.hpp b/opentrack/simple-mat.hpp index e111305a..7432e665 100644 --- a/opentrack/simple-mat.hpp +++ b/opentrack/simple-mat.hpp @@ -107,7 +107,7 @@ struct Mat { Mat ret; for (int j = 0; j < h_; j++) - for (int i = 0; i < w; i++) + for (int i = 0; i < w_; i++) ret(j, i) = this->operator ()(j, i) + other(j, i); return ret; } @@ -125,7 +125,7 @@ struct Mat { Mat ret; for (int j = 0; j < h_; j++) - for (int i = 0; i < w; i++) + for (int i = 0; i < w_; i++) ret(j, i) = this->operator ()(j, i) + other; return ret; } diff --git a/pose-widget/glwidget.cpp b/pose-widget/glwidget.cpp index 66527a57..ed4560af 100644 --- a/pose-widget/glwidget.cpp +++ b/pose-widget/glwidget.cpp @@ -193,10 +193,10 @@ vec2 GLWidget::project(const vec3 &point) double z = std::max(.75, 1. + translation.z()/-60.); int w = width(), h = height(); double x = w * translation.x() / 2. / -40.; - if (abs(x) > w/2) + if (std::abs(x) > w/2) x = x > 0 ? w/2 : w/-2; double y = h * translation.y() / 2. / -40.; - if (abs(y) > h/2) + if (std::abs(y) > h/2) y = y > 0 ? h/2 : h/-2; return vec2 { z * (ret.x() + x), z * (ret.y() + y) }; } diff --git a/qfunctionconfigurator/functionconfig.cpp b/qfunctionconfigurator/functionconfig.cpp index 7edbe0ef..264097ab 100644 --- a/qfunctionconfigurator/functionconfig.cpp +++ b/qfunctionconfigurator/functionconfig.cpp @@ -8,6 +8,7 @@ #include #include #include +#include void Map::setTrackingActive(bool blnActive) { @@ -43,7 +44,7 @@ bool Map::getLastPoint(QPointF& point ) { float Map::getValueInternal(int x) { float sign = x < 0 ? -1 : 1; - x = std::abs(x); + x = abs(x); float ret; int sz = cur.data.size(); if (sz == 0) -- cgit v1.2.3 From 71d8892c19b6a1dbfac7d40a3bb6717316e872b9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 19 Jul 2015 12:26:58 +0200 Subject: app bundle finally works --- CMakeLists.txt | 1 - macosx/install-fail-tool | 4 ++-- macosx/make-app-bundle.sh | 5 ++--- macosx/opentrack.app/Contents/Info.plist | 2 +- macosx/opentrack.sh | 4 ++++ macosx/qt.conf | 2 -- 6 files changed, 9 insertions(+), 9 deletions(-) mode change 100755 => 100644 macosx/install-fail-tool create mode 100755 macosx/opentrack.sh delete mode 100644 macosx/qt.conf (limited to 'macosx') diff --git a/CMakeLists.txt b/CMakeLists.txt index b74ec7f4..3363f14e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -545,7 +545,6 @@ endif() install(DIRECTORY "${CMAKE_SOURCE_DIR}/bin/camera" DESTINATION .) if(APPLE) - install(FILES "${CMAKE_SOURCE_DIR}/macosx/qt.conf" DESTINATION .) install(CODE " execute_process(COMMAND /bin/sh \"${CMAKE_SOURCE_DIR}/macosx/make-app-bundle.sh\" \"${CMAKE_SOURCE_DIR}/macosx\" diff --git a/macosx/install-fail-tool b/macosx/install-fail-tool old mode 100755 new mode 100644 index 0f34c3a1..a5464c18 --- a/macosx/install-fail-tool +++ b/macosx/install-fail-tool @@ -4,7 +4,7 @@ test -n "$1" || exit 1 dir="$1" -for i in "$dir"/* "$dir"/*/*; do +for i in "$dir"/* "$dir"/*/* "$dir"/*/*/*; do { test -x "$i" && test -f "$i"; } || continue case "$i" in *.dll|*.exe) continue ;; @@ -13,7 +13,7 @@ for i in "$dir"/* "$dir"/*/*; do case "$i" in *.dylib|*.bin) strip -x "$i" ;; esac echo ---- $i ---- - install_name_tool -id "@executable_path/$(basename -- "$i")" "$i" + install_name_tool -id "@executable_path/$(echo "$i" | sed -e "s,^$dir/,,")" "$i" otool -L "$i" | awk '{ print $1 }' | while read l; do diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index 7e79d6db..d0588ae2 100644 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -14,16 +14,15 @@ test -n "$version" || exit 1 tmp="$(mktemp -d "/tmp/$APPNAME-tmp.XXXXXXX")" test $? -eq 0 || exit 1 -"$dir/install-fail-tool" "$install" +sh "$dir/install-fail-tool" "$install" cp -R "$dir/opentrack.app" "$tmp/" || exit 1 cp -R "$install" "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 sed -i '' -e "s#@OPENTRACK-VERSION@#$version#g" "$tmp/$APPNAME.app/Contents/Info.plist" || exit 1 -#cp "$dir/qt.conf" "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 - mkdir "$tmp/$APPNAME.iconset" || exit 1 mkdir "$tmp/$APPNAME.app/Contents/Resources" || exit 1 +cp "$dir"/opentrack.sh "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 sips -z 16 16 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1 sips -z 32 32 "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1 diff --git a/macosx/opentrack.app/Contents/Info.plist b/macosx/opentrack.app/Contents/Info.plist index ed4b0b05..41ca402a 100644 --- a/macosx/opentrack.app/Contents/Info.plist +++ b/macosx/opentrack.app/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - opentrack.bin + opentrack.sh CFBundleIdentifier com.github.opentrack CFBundleName diff --git a/macosx/opentrack.sh b/macosx/opentrack.sh new file mode 100755 index 00000000..62ad01a5 --- /dev/null +++ b/macosx/opentrack.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +dir="$(dirname -- "$0")" +exec "$dir"/opentrack.bin -platformpluginpath "$dir" "$@" diff --git a/macosx/qt.conf b/macosx/qt.conf deleted file mode 100644 index e69f24eb..00000000 --- a/macosx/qt.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Paths] -Plugins = . -- cgit v1.2.3