Commit bc1a1f93 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

Removed QT_PLUGIN_PATH being set by setisis, hardcoded lib load dirs

parent 2ae0a01a

isis/scripts/isis3Startup.sh

+0 −4
Original line number Diff line number Diff line
@@ -37,7 +37,3 @@ else 
  PATH="$ISISROOT/bin"

fi

export PATH
 


# Create QT_PLUGIN_PATH env variable

QT_PLUGIN_PATH="$ISISROOT/3rdParty/plugins"

export QT_PLUGIN_PATH

isis/src/base/objs/Environment/Environment.cpp

+8 −13
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
    if ( !core ) {

      std::cout << "****  Qt Plugin Path is not set because no instance of QCoreApplication ****\n";

    }

    else {

      Isis::IString thirdPartyPluginPath = root + "/3rdParty/plugins";

      pluginPaths << thirdPartyPluginPath.ToQt();

      core->setLibraryPaths(pluginPaths);

    }



    return;

  }

isis/src/base/objs/UserInterface/unitTest.cpp

+2 −10
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ int main(int argc, char *argv[]) { 


  cout << "Unit test for Isis::UserInterface ..." << endl;



  QString unitTestXml = Isis::FileName(ISISBUILDDIR + "/unitTest/isis3_unit_test_UserInterface.xml").expanded();

  QString highpass = Isis::FileName(ISISBUILDDIR + "/bin/xml/highpass.xml").expanded();

  QString unitTestXml = Isis::FileName(QString(ISISBUILDDIR) + "/unitTest/isis3_unit_test_UserInterface.xml").expanded();

  QString highpass = Isis::FileName(QString(ISISBUILDDIR) + "/bin/xml/highpass.xml").expanded();



  char *myArgv[15];// = {"unitTest", "from=input.cub", "to=output.cub"};
@@ -300,11 +300,7 @@ int main(int argc, char *argv[]) { 
    cout << "Testing Invalid Parameter" << endl;

    try {

      int myArgc = 0;

<<<<<<< HEAD

      strcpy(myArgv[myArgc++], "$ISISROOT/src/base/apps/highpass/highpass");

=======

      strcpy(myArgv[myArgc++], "$ISISROOT/bin/highpass/highpass");

>>>>>>> fc8baa5a35cffe7b23a01f3cabbc9ff729d42cd5

      strcpy(myArgv[myArgc++], "bogus=parameter");



      Isis::UserInterface ui(unitTestXml, myArgc, myArgv);
@@ -892,11 +888,7 @@ int main(int argc, char *argv[]) { 
    cout << "Testing -RESTORE with invalid (non-existing) .par file" << endl;

    try {

      int myArgc = 0;

<<<<<<< HEAD

      strcpy(myArgv[myArgc++], "$ISISROOT/src/base/apps/highpass/highpass");

=======

      strcpy(myArgv[myArgc++], "$ISISROOT/bin/highpass");

>>>>>>> fc8baa5a35cffe7b23a01f3cabbc9ff729d42cd5

      strcpy(myArgv[myArgc++], "-restore=junk.par");



      Isis::UserInterface ui(unitTestXml, myArgc, myArgv);