Commit 9e0ab4d8 authored by Christopher Combs's avatar Christopher Combs
Browse files

Removed QT_PLUGIN_PATH as environment variable from statup isis3Startup scripts. Fixes #4617. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@8134 41f8697f-d340-4b68-9986-7bafba869bb8
parent 04306ebb

isis/scripts/isis3Startup.csh

+5 −19
Original line number Diff line number Diff line
@@ -22,19 +22,11 @@ 
#       MAR 12 2009 - Christopher Austin - Changed the way ISIS3TESTDATE is set

#                       to prevent its setting for outside groups and default

#                       to "/usgs/cpkgs/isis3/testData"

#       SEP 08 2017 - Christopher Combs - Removed setting of QT_PLUGIN_PATH as

#                       an environment variable. Fixes #4617

#_VER   $Id: isis3Startup.csh,v 1.5 2010/03/16 19:40:22 ehyer Exp $

#_END

################################################################################

# Check parameters

set QTPLUGINPATH = "true"

foreach arg ($argv)

  if ( "$arg" == "-noqtpluginpath" ) then

    set QTPLUGINPATH = "false"

  else

    echo "Uknown argument $arg"

    exit 1

  endif

end



# Establish a platform switch variable

set Platform = `uname -s`
@@ -69,14 +61,8 @@ else 
  endif

endif



# Create QT_PLUGIN_PATH env variable

if ($QTPLUGINPATH == "true") then

  setenv QT_PLUGIN_PATH "$ISISROOT/3rdParty/plugins"

endif



unset Platform



if ( -f $ISISROOT/scripts/tabcomplete.csh ) then

  source $ISISROOT/scripts/tabcomplete.csh;

endif

isis/scripts/isis3Startup.py

+1 −3
Original line number Diff line number Diff line
@@ -36,7 +36,5 @@ def setisis(): 
  else:

    os.environ['PATH'] = "%s:%s/bin" % (os.environ['PATH'], ISISROOT)



  os.environ['QT_PLUGIN_PATH'] = "%s/3rdParty/plugins" % (ISISROOT)



if __name__ == "__main__":

  setisis()