Unverified Commit 5bc9b6b0 authored Jun 20, 2018 by Kristin Committed by GitHub Jun 20, 2018

Merge pull request #267 from jessemapel/ipceCnetHealth

Removed QtCharts references

parents f024deed 0629feae

isis/make/config.darwin-10.5

+0 −2

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@ QTDARWINFLAGS += -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
		QTDIR = $(ISIS3OPT)
		QTINCDIR = -I$(QTDIR)/libexec/qt4-mac/mkspecs/macx-g++
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtCharts
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtCore
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtAssistant
		QTINCDIR += -I$(QTDIR)/libexec/qt4-mac/include/QtGui
		@@ -267,7 +266,6 @@ THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtXml.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtSql.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtGui.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtCore.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtWebKit.framework"

isis/make/config.darwin-MacOSX10_10

+0 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,6 @@ ifeq (,$(findstring $(QTFRAMEWORKDIR)/QtCore.framework,$(wildcard $(QTFRAMEWORKD
		endif

		QTINCDIR = -I$(QTDIR)/share/qt4/mkspecs/macx-g++
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtAssistant.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtGui.framework/Headers
		@@ -320,7 +319,6 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtXml.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSql.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtGui.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCore.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework"

isis/make/config.darwin-MacOSX10_11

+0 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ QTDIR = $(ISIS3EXEC)/qt5
		QTFRAMEWORKDIR = $(QTDIR)/lib

		QTINCDIR = -I$(QTDIR)/mkspecs/macx-clang
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtConcurrent.framework/Headers
		QTINCDIR += -isystem $(QTFRAMEWORKDIR)/QtDBus.framework/Headers

isis/make/config.darwin-MacOSX10_6

+0 −2

Original line number	Diff line number	Diff line
		@@ -99,7 +99,6 @@ ifeq (,$(findstring $(QTFRAMEWORKDIR)/QtCore.framework,$(wildcard $(QTFRAMEWORKD
		endif

		QTINCDIR = -I$(QTDIR)/share/qt4/mkspecs/macx-g++
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtAssistant.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtGui.framework/Headers
		@@ -325,7 +324,6 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtXml.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSql.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtGui.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCore.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework"

isis/make/config.darwin-MacOSX10_8

+0 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,6 @@ ifeq (,$(findstring $(QTFRAMEWORKDIR)/QtCore.framework,$(wildcard $(QTFRAMEWORKD
		endif

		QTINCDIR = -I$(QTDIR)/share/qt4/mkspecs/macx-g++
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCharts.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtCore.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtAssistant.framework/Headers
		QTINCDIR += -I$(QTFRAMEWORKDIR)/QtGui.framework/Headers
		@@ -329,7 +328,6 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtXml.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtNetwork.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSql.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtGui.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCharts.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtCore.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtSvg.framework"
		THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework"