Skip to content

Commit e6ca7f1

Browse files
grizonnetmalexbruy
authored andcommittedMay 24, 2017
ENH: remove useless QApplication and prefer to use QGIS_PREFIX_PATH
(cherry picked from commit 82f2726)
1 parent 1bcaca3 commit e6ca7f1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
 

‎python/plugins/processing/algs/otb/maintenance/OTBHelper.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -693,10 +693,10 @@ def create_html_description():
693693
if __name__ == "__main__":
694694
# Prepare the environment
695695
from qgis.core import QgsApplication
696-
from qgis.PyQt.QtWidgets import QApplication
697-
app = QApplication([])
698-
QgsApplication.setPrefixPath("/usr", True)
696+
697+
app = QgsApplication([], True)
699698
QgsApplication.initQgis()
699+
700700
# Prepare processing framework
701701
from processing.core.Processing import Processing
702702
Processing.initialize()
@@ -717,4 +717,3 @@ def create_html_description():
717717

718718
# Exit applications
719719
QgsApplication.exitQgis()
720-
QApplication.exit()

‎python/plugins/processing/algs/otb/maintenance/README

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ export LD_LIBRARY_PATH=/path/to/OTB/install/lib/:$LD_LIBRARY_PATH
1818

1919
Set QGIS environment
2020
---------------------
21+
export QGIS_PREFIX_PATH=/path/to/QGIS/install
2122
export PYTHONPATH=:/usr/share/qgis/python/plugins:~/.qgis2/python/plugins:$PYTHONPATH
2223
# Set LD_LIBRARY_PATH
23-
export LD_LIBRARY_PATH=/path/to/QGIS/install/lib/:$LD_LIBRARY_PATH
24+
export LD_LIBRARY_PATH=$QGIS_PREFIX_PATH/lib/:$LD_LIBRARY_PATH
2425
# Add maintenance folder to python path
2526
export PYTHONPATH=/path/to/QGIS/src/python/plugins/processing/algs/otb/maintenance:$PYTHONPATH
2627

0 commit comments

Comments
 (0)
Please sign in to comment.