Mercurial > mxe-octave
diff installer-files/octave.vbs @ 4222:44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
* src/qt5.mk: new file
* src/qtbase-1-fixes.patch: new file
* src/qtbase.mk: new file
* src/qtimageformats-1.patch: new file
* src/qtimageformats.mk: new file
* src/qtsvg.mk: new file
* src/qttools-1.patch: new file
* added src/qttools.mk: new file
* changed Makefile.in: added ENABLE_QT5 option
* configure.ac: added enable-qt5 option
* index.html: added new files to packages
* installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.bat: added setup of qt5 bin path
* src/default-octave.mk: added settig fot qt5 usage
* src/qscintilla.mk: added qt5 path
author | John D |
---|---|
date | Thu, 29 Sep 2016 11:22:51 -0400 |
parents | cc549d1865cb |
children | a45374f7d9a3 |
line wrap: on
line diff
--- a/installer-files/octave.vbs Tue Sep 27 16:00:44 2016 -0400 +++ b/installer-files/octave.vbs Thu Sep 29 11:22:51 2016 -0400 @@ -17,8 +17,14 @@ wshSystemEnv("GS") = "gs.exe" -' set Qt plugin directory -wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\plugins" +' set Qt plugin directory and path +Set objFSO = CreateObject("Scripting.FileSystemObject") +If objFSO.FolderExists(OctavePath & "\qt5\bin") Then + wshSystemEnv("PATH") = OctavePath & "\qt5\bin;" & wshSystemEnv("PATH") + wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\qt5\plugins" +Else + wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\plugins" +End If ' check args to see if told to run gui or command line ' and build other args to use