sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More Mac OS fixes for Qt5.

Browse Source
This commit is contained in:
lotodore
2013-08-31 21:37:06 +02:00
parent ec3c2eee84
commit f29efc2892
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac_post_make.sh
+1 -1
View File
@@ -84,7 +84,7 @@ if [ "$1" != "--without-qt" ] ; then
QTWIDGETS_LINK=$(otool -L $BINARY | grep QtWidgets | cut -d"(" -f1 | cut -f2) QTWIDGETS_LINK=$(otool -L $BINARY | grep QtWidgets | cut -d"(" -f1 | cut -f2)
QTSQL_LINK=$(otool -L $BINARY | grep QtSql | cut -d"(" -f1 | cut -f2) QTSQL_LINK=$(otool -L $BINARY | grep QtSql | cut -d"(" -f1 | cut -f2)
QTNETWORK_LINK=$(otool -L $BINARY | grep QtNetwork | cut -d"(" -f1 | cut -f2) QTNETWORK_LINK=$(otool -L $BINARY | grep QtNetwork | cut -d"(" -f1 | cut -f2)
QTPRINT_LINK=$(otool -L $BINARY | grep QtPrintSupport | cut -d"(" -f1 | cut -f2) QTPRINT_LINK=$(otool -L $BINARY_PLUGIN_PATH/platforms/libqcocoa.dylib | grep QtPrintSupport | cut -d"(" -f1 | cut -f2)
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY
install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY
install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY install_name_tool -change $QTWIDGETS_LINK @executable_path/../Frameworks/$QTWIDGETS $BINARY
src/pokerth.cpp
+2 -1
View File
@@ -89,7 +89,8 @@ int main( int argc, char **argv )
#ifdef __APPLE__ #ifdef __APPLE__
// The following needs to be done directly after the application is created. // The following needs to be done directly after the application is created.
QDir dir(QApplication::applicationDirPath()); QDir dir(argv[0]);
dir.cdUp();
dir.cdUp(); dir.cdUp();
dir.cd("plugins"); dir.cd("plugins");
QApplication::setLibraryPaths(QStringList(dir.absolutePath())); QApplication::setLibraryPaths(QStringList(dir.absolutePath()));