Changeset 4bddb9ca in sasview for installers

Timestamp:

Aug 6, 2018 4:15:47 AM (7 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

bc8750eb, c0de493

Parents:

a688be1 (diff), 97df8a9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

• installers/sasview_qt5_osx.spec (modified) (3 diffs)

installers/sasview_qt5_osx.spec

@@ -44 +44 @@
 # ADDITIONAL DATA ############################################################
 datas = [('../src/sas/sasview/images', 'images')]
-
-datas = [('../src/sas/sasview/images/ball.ico', '.')]
-
 datas.append(('../src/sas/sasview/media','media'))
 datas.append(('../src/sas/sasview/test','test'))
@@ -173 +170 @@
           debug=False,
           upx=UPX,
-          icon=os.path.join("../src/sas/sasview/images","ball.ico"),
+          icon=os.path.join("../src/sas/sasview/images","ball.icns"),
           version="version.txt",
           console=False )
@@ -189 +186 @@
     app = BUNDLE(coll,
         name='sasview.app',
-        icon='../src/sas/sasview/images/ball.ico',
+        icon='../src/sas/sasview/images/ball.icns',
         bundle_identifier=None)