From b3f6d20591b461bdd9de52c87d6bc17b52ad2575 Mon Sep 17 00:00:00 2001 From: Chris Mizerak Date: Sun, 6 May 2018 20:47:36 -0700 Subject: [PATCH] Mac add missing Qt framework --- OSCWidgets.xcodeproj/project.pbxproj | 2 +- OSCWidgets/EosPlatform.cpp | 2 +- OSCWidgets/EosPlatform.h | 2 +- OSCWidgets/EosPlatform_Mac.cpp | 5 ++++- OSCWidgets/EosPlatform_Mac.h | 2 +- OSCWidgets/EosPlatform_Mac_Bridge.h | 3 ++- OSCWidgets/EosPlatform_Mac_Native.h | 2 +- OSCWidgets/EosPlatform_Mac_Native.mm | 19 ++++++++++++++++++- OSCWidgets/MainWindow.cpp | 2 +- OSCWidgets/main.cpp | 9 --------- 10 files changed, 30 insertions(+), 18 deletions(-) diff --git a/OSCWidgets.xcodeproj/project.pbxproj b/OSCWidgets.xcodeproj/project.pbxproj index 1f997cf..1b384c3 100644 --- a/OSCWidgets.xcodeproj/project.pbxproj +++ b/OSCWidgets.xcodeproj/project.pbxproj @@ -761,7 +761,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "##### copy Qt platform plugins #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/platforms/libqcocoa.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\n\n##### copy Qt imageformat plugins #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqicns.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqjpeg.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqtga.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqwbmp.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqgif.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqico.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqsvg.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqtiff.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqwebp.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\n\n##### copy QtCore #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtCore.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### copy QtWidgets #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtWidgets.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### copy QtGui #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtGui.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### copy QtNetwork #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtNetwork.framework/Versions/5/QtNetwork \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtNetwork.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### identify bundled Qt frameworks #####\ninstall_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5/QtCore\"\ninstall_name_tool -id @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets\"\ninstall_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork\"\n\n##### redirect executable to use bundled Qt frameworks #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\ninstall_name_tool -change QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\ninstall_name_tool -change QtNetwork.framework/Versions/5/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\n\n##### redirect bundled frameworks/libraries to use bundled dependecies #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5/QtGui\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork\"\n\n##### platform plugins #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\ninstall_name_tool -change QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\n\n##### imageformat plugins #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqicns.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqicns.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqjpeg.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqjpeg.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtga.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtga.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwbmp.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwbmp.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqgif.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqgif.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqico.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqico.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqsvg.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqsvg.dylib\"\ninstall_name_tool -change QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqsvg.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtiff.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtiff.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwebp.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwebp.dylib\""; + shellScript = "##### copy Qt platform plugins #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/platforms/libqcocoa.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\n\n##### copy Qt imageformat plugins #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqicns.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqjpeg.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqtga.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqwbmp.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqgif.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqico.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqtiff.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\ncp ~/Qt5.6.3/5.6.3/clang_64/plugins/imageformats/libqwebp.dylib \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats\"\n\n##### copy QtCore #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtCore.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### copy QtWidgets #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtWidgets.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### copy QtGui #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtGui.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### copy QtNetwork #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtNetwork.framework/Versions/5/QtNetwork \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtNetwork.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### copy QtPrintSupport #####\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5\"\nmkdir -p \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5/Resources\"\ncp -R ~/Qt5.6.3/5.6.3/clang_64/lib/QtPrintSupport.framework/Versions/5/QtPrintSupport \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5\"\ncp ~/Qt5.6.3/5.6.3/clang_64/lib/QtPrintSupport.framework/Resources/Info.plist \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5/Resources\"\ncd \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions\"\nif [ ! -L Current ]; then\nln -s 5 Current\nfi\n\n##### identify bundled Qt frameworks #####\ninstall_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtCore.framework/Versions/5/QtCore\"\ninstall_name_tool -id @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets\"\ninstall_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork\"\ninstall_name_tool -id @executable_path/../Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport\"\n\n##### redirect executable to use bundled Qt frameworks #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\ninstall_name_tool -change QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\ninstall_name_tool -change QtNetwork.framework/Versions/5/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\ninstall_name_tool -change QtPrintSupport.framework/Versions/5/QtPrintSupport @executable_path/../Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/MacOs/${PRODUCT_NAME}\"\n\n##### redirect bundled frameworks/libraries to use bundled dependecies #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtWidgets.framework/Versions/5/QtWidgets\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtGui.framework/Versions/5/QtGui\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport\"\ninstall_name_tool -change QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport\"\n\n##### platform plugins #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\ninstall_name_tool -change QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\ninstall_name_tool -change QtPrintSupport.framework/Versions/5/QtPrintSupport @executable_path/../Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/platforms/libqcocoa.dylib\"\n\n##### imageformat plugins #####\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqicns.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqicns.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqjpeg.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqjpeg.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtga.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtga.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwbmp.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwbmp.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqgif.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqgif.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqico.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqico.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtiff.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqtiff.dylib\"\ninstall_name_tool -change QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwebp.dylib\"\ninstall_name_tool -change QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents/Plugins/imageformats/libqwebp.dylib\""; }; 97E137551AB28E930056BE05 /* moc MainWindow */ = { isa = PBXShellScriptBuildPhase; diff --git a/OSCWidgets/EosPlatform.cpp b/OSCWidgets/EosPlatform.cpp index b9ddf21..99b1146 100755 --- a/OSCWidgets/EosPlatform.cpp +++ b/OSCWidgets/EosPlatform.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com +// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/OSCWidgets/EosPlatform.h b/OSCWidgets/EosPlatform.h index a579070..43f15b2 100755 --- a/OSCWidgets/EosPlatform.h +++ b/OSCWidgets/EosPlatform.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com +// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/OSCWidgets/EosPlatform_Mac.cpp b/OSCWidgets/EosPlatform_Mac.cpp index 5ae38f9..c2c2c0b 100755 --- a/OSCWidgets/EosPlatform_Mac.cpp +++ b/OSCWidgets/EosPlatform_Mac.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com +// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -41,7 +41,10 @@ EosPlatform_Mac::~EosPlatform_Mac() bool EosPlatform_Mac::Initialize(std::string &error) { if(m_Platform == 0) + { m_Platform = Bridge_CreatePlatform(error); + Bridge_InitQtPlugins(); + } return (m_Platform != 0); } diff --git a/OSCWidgets/EosPlatform_Mac.h b/OSCWidgets/EosPlatform_Mac.h index 32edf56..47d18ae 100755 --- a/OSCWidgets/EosPlatform_Mac.h +++ b/OSCWidgets/EosPlatform_Mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com +// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/OSCWidgets/EosPlatform_Mac_Bridge.h b/OSCWidgets/EosPlatform_Mac_Bridge.h index e3d0167..a6cd7be 100755 --- a/OSCWidgets/EosPlatform_Mac_Bridge.h +++ b/OSCWidgets/EosPlatform_Mac_Bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com +// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,6 +29,7 @@ void* Bridge_CreatePlatform(std::string &error); void Bridge_DestroyPlatform(void *platform); void* Bridge_BeginActivity(const std::string &reason, std::string &error); void Bridge_EndActivity(void *activity); +void Bridge_InitQtPlugins(); //////////////////////////////////////////////////////////////////////////////// diff --git a/OSCWidgets/EosPlatform_Mac_Native.h b/OSCWidgets/EosPlatform_Mac_Native.h index fcaa131..1d5feb4 100755 --- a/OSCWidgets/EosPlatform_Mac_Native.h +++ b/OSCWidgets/EosPlatform_Mac_Native.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com +// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/OSCWidgets/EosPlatform_Mac_Native.mm b/OSCWidgets/EosPlatform_Mac_Native.mm index 424e07c..2325eb6 100755 --- a/OSCWidgets/EosPlatform_Mac_Native.mm +++ b/OSCWidgets/EosPlatform_Mac_Native.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Electronic Theatre Controls, Inc., http://www.etcconnect.com +// Copyright (c) 2018 Electronic Theatre Controls, Inc., http://www.etcconnect.com // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -20,6 +20,9 @@ #import "EosPlatform_Mac_Native.h" #import "EosPlatform_Mac_Bridge.h" +#import +#import +#import //////////////////////////////////////////////////////////////////////////////// @@ -112,3 +115,17 @@ + (void)EndActivity:(id)activity @end //////////////////////////////////////////////////////////////////////////////// + +void Bridge_InitQtPlugins() +{ + // only load plugins from our bundle + CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle())); + if(url != nil) + { + QDir dir( QUrl::fromCFURL(url).path() ); + if( dir.cd("Contents/Plugins") ) + QApplication::setLibraryPaths(QStringList() << dir.canonicalPath()); + } +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/OSCWidgets/MainWindow.cpp b/OSCWidgets/MainWindow.cpp index 86d8e3c..e8c38e9 100644 --- a/OSCWidgets/MainWindow.cpp +++ b/OSCWidgets/MainWindow.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// -#define APP_VERSION "0.7" +#define APP_VERSION "0.8" #define MIN_OPACITY 10 diff --git a/OSCWidgets/main.cpp b/OSCWidgets/main.cpp index 2d4474d..c536bcc 100644 --- a/OSCWidgets/main.cpp +++ b/OSCWidgets/main.cpp @@ -27,8 +27,6 @@ #include "Utils.h" #include "EosPlatform.h" -// TODO: image format plugins! - //////////////////////////////////////////////////////////////////////////////// int main(int argc, char* argv[]) @@ -50,13 +48,6 @@ int main(int argc, char* argv[]) } QApplication app(argc, argv); - -#ifndef WIN32 - QDir dir( app.applicationDirPath() ); - dir.cdUp(); - dir.cd("Plugins"); - app.setLibraryPaths( QStringList(dir.canonicalPath()) ); -#endif app.setDesktopSettingsAware(false); app.setQuitOnLastWindowClosed(false);