diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp index 124d103885..0b720d60f6 100644 --- a/rbutil/rbutilqt/main.cpp +++ b/rbutil/rbutilqt/main.cpp @@ -28,7 +28,12 @@ Q_IMPORT_PLUGIN(qtaccessiblewidgets) int main( int argc, char ** argv ) { QApplication app( argc, argv ); - +#if defined(Q_OS_MAC) + QDir dir(QApplication::applicationDirPath()); + dir.cdUp(); + dir.cd("plugins"); + QApplication::addLibraryPath(dir.absolutePath()); +#endif QString absolutePath = QCoreApplication::instance()->applicationDirPath(); // portable installation: // check for a configuration file in the program folder. diff --git a/rbutil/rbutilqt/osx_deploy.sh b/rbutil/rbutilqt/osx_deploy.sh index f40516aabe..7969685ea6 100755 --- a/rbutil/rbutilqt/osx_deploy.sh +++ b/rbutil/rbutilqt/osx_deploy.sh @@ -83,5 +83,16 @@ install_name_tool -change $QTDIR/lib/QtNetwork.framework/Versions/4/QtNetwork @ install_name_tool -change $QTDIR/lib/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore rbutilqt.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui install_name_tool -change $QTDIR/lib/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore rbutilqt.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork +echo "insert accessibility plugins" + +mkdir -p rbutilqt.app/Contents/plugins/accessible + +cp $QTDIR/plugins/accessible/*.dylib rbutilqt.app/Contents/plugins/accessible + +install_name_tool -change $QTDIR/lib/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore rbutilqt.app/Contents/plugins/accessible/libqtaccessiblewidgets.dylib +install_name_tool -change $QTDIR/lib/QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui rbutilqt.app/Contents/plugins/accessible/libqtaccessiblewidgets.dylib +install_name_tool -change $QTDIR/lib/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore rbutilqt.app/Contents/plugins/accessible/libqtaccessiblecompatwidgets.dylib +install_name_tool -change $QTDIR/lib/QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui rbutilqt.app/Contents/plugins/accessible/libqtaccessiblecompatwidgets.dylib + echo "Creating disk image" -hdiutil create -srcfolder rbutilqt.app -ov rbutilqt.dmg \ No newline at end of file +hdiutil create -srcfolder rbutilqt.app -ov rbutilqt.dmg