Commit 0f5ec675 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Updated to Qt5.6. Fixed includes and updated config file for Fedora 21. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/v006LibrariesV2@6724 41f8697f-d340-4b68-9986-7bafba869bb8
parent 7adc61c7

isis/make/config.linux-x86_64

+57 −67
Original line number Diff line number Diff line
@@ -83,37 +83,35 @@ ISIS3LOCAL := /usgs/pkgs/local/$(ISISLOCALVERSION) 
#---------------------------------------------------------------------------

# Set up for Qt

#---------------------------------------------------------------------------

QTINCDIR = -I$(ISIS3LOCAL)/include/qt/qt5.5.1

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/Qt

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtCore

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtAssistant

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtConcurrent

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtDBus

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtGui

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtMultimedia

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtMultimediaWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtNetwork

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtOpenGL

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtPositioning

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtPrintSupport

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtQml

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtQuick

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtScript

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtScriptTools

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtSensors

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtSql

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtSvg

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtTest

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebChannel

#QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebEngine

#QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebEngineWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebKit

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebKitWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtXml

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtXmlPatterns

QTINCDIR = -I$(ISIS3LOCAL)/include/qt/qt5.6.0

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/Qt

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtCore

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtAssistant

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtConcurrent

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtDBus

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtGui

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtMultimedia

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtMultimediaWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtNetwork

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtOpenGL

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtPositioning

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtPrintSupport

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtQml

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtQuick

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtScript

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtScriptTools

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtSensors

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtSql

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtSvg

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtTest

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtWebChannel

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtWebEngine

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtWebEngineWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtXml

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.6.0/QtXmlPatterns

QTLIBDIR = -L$(ISIS3LOCAL)/lib

QTLIB    = -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebKit -lQt5WebKitWidgets -lQt5DBus

QTLIB    = -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebEngine -lQt5WebEngineWidgets -lQt5DBus



UIC      = $(ISIS3LOCAL)/bin/uic

MOC      = $(ISIS3LOCAL)/bin/moc
@@ -309,103 +307,95 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include 
#  Libraries

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.6.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Core.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Core.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Core.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Core.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5DBus.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5DBus.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5DBus.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5DBus.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Gui.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Gui.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Gui.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Gui.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Multimedia.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Multimedia.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Multimedia.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Multimedia.so.5.6.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5MultimediaWidgets.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5MultimediaWidgets.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5MultimediaWidgets.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5MultimediaWidgets.so.5.6.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Network.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Network.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Network.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Network.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5OpenGL.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5OpenGL.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5OpenGL.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5OpenGL.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Positioning.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Positioning.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Positioning.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Positioning.so.5.6.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5PrintSupport.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5PrintSupport.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5PrintSupport.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5PrintSupport.so.5.6.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Qml.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Qml.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Qml.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Qml.so.5.6.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Quick.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Quick.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Quick.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Quick.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sensors.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sensors.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sensors.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sensors.so.5.6.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sql.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sql.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sql.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sql.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Svg.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Svg.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Svg.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Svg.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Test.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Test.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Test.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Test.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebChannel.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebChannel.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebChannel.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebChannel.so.5.6.*[^g]"



#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so.5"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so.5.6.*[^g]"



#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so.5"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so.5.6.*[^g]"



THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKit.so"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKit.so.5"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKit.so.5.5.*[^g]"



THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKitWidgets.so"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKitWidgets.so.5"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKitWidgets.so.5.5.*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Widgets.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Widgets.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Widgets.so.5.5*[^g]"



#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so.5"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Widgets.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Xml.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Xml.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Xml.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Xml.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5XmlPatterns.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5XmlPatterns.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5XmlPatterns.so.5.5*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5XmlPatterns.so.5.6*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libqwt.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libprotobuf.so*"

isis/make/config.linux-x86_64_Fedora21

0 → 100644
+447 −0

File added.

Preview size limit exceeded, changes collapsed.

isis/src/base/apps/spiceinit/SpiceClient.cpp

+8 −0
Original line number Diff line number Diff line
@@ -233,6 +233,14 @@ namespace Isis { 
              *p_error += ". The background request is not allowed";

              break;



            case QNetworkReply::TooManyRedirectsError:

              *p_error += ". The maximum limit of redirects was reached";

              break;



            case QNetworkReply::InsecureRedirectError:

              *p_error += ". A redirect from https to http occurred";

              break;



            case QNetworkReply::ProxyConnectionRefusedError:

              *p_error += ". The proxy server refused the connection";

              break;

isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <QProgressBar>

#include <QPushButton>

#include <QSettings>

#include <QWebView>

#include <QWebEngineView>



#include <geos/geom/Coordinate.h>

#include <geos/geom/CoordinateSequence.h>

isis/src/qisis/objs/QIsisApplication/QIsisApplication.cpp

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <QObject>

#include <QMessageBox>

#include <QUrl>

#include <QWebView>

#include <QWebEngineView>



#include "FileName.h"

#include "IException.h"
@@ -61,7 +61,7 @@ namespace Isis { 
   * Open a URL in the browser specified by Isis.

   */

  void QIsisApplication::openUrl(QUrl url) {

     QWebView *view = new QWebView(NULL);

     QWebEngineView *view = new QWebEngineView(NULL);

     view->setAttribute(Qt::WA_DeleteOnClose);

     view->load(url);

     view->show();