Move contributed sources to contrib directory

.. Makes it easier to identify code that has been snaffled in from other repositories and check licensing .. The httpserver is now no longer optional, since it is delivered as contributed source.
GoldenCheetah · May 16, 2021 · e1ac00b · e1ac00b
1 parent 3d07321
commit e1ac00b
Show file tree

Hide file tree

Showing 97 changed files with 53 additions and 48 deletions.
diff --git a/httpserver/httpconnectionhandler.cpp → contrib/httpserver/httpconnectionhandler.cpp b/httpserver/httpconnectionhandler.cpp → contrib/httpserver/httpconnectionhandler.cpp
diff --git a/httpserver/httpconnectionhandler.h → contrib/httpserver/httpconnectionhandler.h b/httpserver/httpconnectionhandler.h → contrib/httpserver/httpconnectionhandler.h
diff --git a/httpserver/httpconnectionhandlerpool.cpp → .../httpserver/httpconnectionhandlerpool.cpp b/httpserver/httpconnectionhandlerpool.cpp → .../httpserver/httpconnectionhandlerpool.cpp
diff --git a/httpserver/httpconnectionhandlerpool.h → ...ib/httpserver/httpconnectionhandlerpool.h b/httpserver/httpconnectionhandlerpool.h → ...ib/httpserver/httpconnectionhandlerpool.h
diff --git a/httpserver/httpcookie.cpp → contrib/httpserver/httpcookie.cpp b/httpserver/httpcookie.cpp → contrib/httpserver/httpcookie.cpp
diff --git a/httpserver/httpcookie.h → contrib/httpserver/httpcookie.h b/httpserver/httpcookie.h → contrib/httpserver/httpcookie.h
diff --git a/httpserver/httpglobal.cpp → contrib/httpserver/httpglobal.cpp b/httpserver/httpglobal.cpp → contrib/httpserver/httpglobal.cpp
diff --git a/httpserver/httpglobal.h → contrib/httpserver/httpglobal.h b/httpserver/httpglobal.h → contrib/httpserver/httpglobal.h
diff --git a/httpserver/httplistener.cpp → contrib/httpserver/httplistener.cpp b/httpserver/httplistener.cpp → contrib/httpserver/httplistener.cpp
diff --git a/httpserver/httplistener.h → contrib/httpserver/httplistener.h b/httpserver/httplistener.h → contrib/httpserver/httplistener.h
diff --git a/httpserver/httprequest.cpp → contrib/httpserver/httprequest.cpp b/httpserver/httprequest.cpp → contrib/httpserver/httprequest.cpp
diff --git a/httpserver/httprequest.h → contrib/httpserver/httprequest.h b/httpserver/httprequest.h → contrib/httpserver/httprequest.h
diff --git a/httpserver/httprequesthandler.cpp → contrib/httpserver/httprequesthandler.cpp b/httpserver/httprequesthandler.cpp → contrib/httpserver/httprequesthandler.cpp
diff --git a/httpserver/httprequesthandler.h → contrib/httpserver/httprequesthandler.h b/httpserver/httprequesthandler.h → contrib/httpserver/httprequesthandler.h
diff --git a/httpserver/httpresponse.cpp → contrib/httpserver/httpresponse.cpp b/httpserver/httpresponse.cpp → contrib/httpserver/httpresponse.cpp
diff --git a/httpserver/httpresponse.h → contrib/httpserver/httpresponse.h b/httpserver/httpresponse.h → contrib/httpserver/httpresponse.h
diff --git a/httpserver/httpserver.pri → contrib/httpserver/httpserver.pri b/httpserver/httpserver.pri → contrib/httpserver/httpserver.pri
diff --git a/httpserver/httpsession.cpp → contrib/httpserver/httpsession.cpp b/httpserver/httpsession.cpp → contrib/httpserver/httpsession.cpp
diff --git a/httpserver/httpsession.h → contrib/httpserver/httpsession.h b/httpserver/httpsession.h → contrib/httpserver/httpsession.h
diff --git a/httpserver/httpsessionstore.cpp → contrib/httpserver/httpsessionstore.cpp b/httpserver/httpsessionstore.cpp → contrib/httpserver/httpsessionstore.cpp
diff --git a/httpserver/httpsessionstore.h → contrib/httpserver/httpsessionstore.h b/httpserver/httpsessionstore.h → contrib/httpserver/httpsessionstore.h
diff --git a/httpserver/staticfilecontroller.cpp → contrib/httpserver/staticfilecontroller.cpp b/httpserver/staticfilecontroller.cpp → contrib/httpserver/staticfilecontroller.cpp
diff --git a/httpserver/staticfilecontroller.h → contrib/httpserver/staticfilecontroller.h b/httpserver/staticfilecontroller.h → contrib/httpserver/staticfilecontroller.h
diff --git a/levmar/Axb.c → contrib/levmar/Axb.c b/levmar/Axb.c → contrib/levmar/Axb.c
diff --git a/levmar/Axb_core.c → contrib/levmar/Axb_core.c b/levmar/Axb_core.c → contrib/levmar/Axb_core.c
diff --git a/levmar/compiler.h → contrib/levmar/compiler.h b/levmar/compiler.h → contrib/levmar/compiler.h
diff --git a/levmar/levmar.h → contrib/levmar/levmar.h b/levmar/levmar.h → contrib/levmar/levmar.h
diff --git a/levmar/lm.c → contrib/levmar/lm.c b/levmar/lm.c → contrib/levmar/lm.c
diff --git a/levmar/lm.h → contrib/levmar/lm.h b/levmar/lm.h → contrib/levmar/lm.h
diff --git a/levmar/lm_core.c → contrib/levmar/lm_core.c b/levmar/lm_core.c → contrib/levmar/lm_core.c
diff --git a/levmar/lmbc.c → contrib/levmar/lmbc.c b/levmar/lmbc.c → contrib/levmar/lmbc.c
diff --git a/levmar/lmbc_core.c → contrib/levmar/lmbc_core.c b/levmar/lmbc_core.c → contrib/levmar/lmbc_core.c
diff --git a/levmar/lmblec.c → contrib/levmar/lmblec.c b/levmar/lmblec.c → contrib/levmar/lmblec.c
diff --git a/levmar/lmblec_core.c → contrib/levmar/lmblec_core.c b/levmar/lmblec_core.c → contrib/levmar/lmblec_core.c
diff --git a/levmar/lmbleic.c → contrib/levmar/lmbleic.c b/levmar/lmbleic.c → contrib/levmar/lmbleic.c
diff --git a/levmar/lmbleic_core.c → contrib/levmar/lmbleic_core.c b/levmar/lmbleic_core.c → contrib/levmar/lmbleic_core.c
diff --git a/levmar/lmlec.c → contrib/levmar/lmlec.c b/levmar/lmlec.c → contrib/levmar/lmlec.c
diff --git a/levmar/lmlec_core.c → contrib/levmar/lmlec_core.c b/levmar/lmlec_core.c → contrib/levmar/lmlec_core.c
diff --git a/levmar/misc.c → contrib/levmar/misc.c b/levmar/misc.c → contrib/levmar/misc.c
diff --git a/levmar/misc.h → contrib/levmar/misc.h b/levmar/misc.h → contrib/levmar/misc.h
diff --git a/levmar/misc_core.c → contrib/levmar/misc_core.c b/levmar/misc_core.c → contrib/levmar/misc_core.c
diff --git a/lmfit/COPYING → contrib/lmfit/COPYING b/lmfit/COPYING → contrib/lmfit/COPYING
diff --git a/lmfit/lmcurve.c → contrib/lmfit/lmcurve.c b/lmfit/lmcurve.c → contrib/lmfit/lmcurve.c
diff --git a/lmfit/lmcurve.h → contrib/lmfit/lmcurve.h b/lmfit/lmcurve.h → contrib/lmfit/lmcurve.h
diff --git a/lmfit/lmcurve_tyd.h → contrib/lmfit/lmcurve_tyd.h b/lmfit/lmcurve_tyd.h → contrib/lmfit/lmcurve_tyd.h
diff --git a/lmfit/lmmin.c → contrib/lmfit/lmmin.c b/lmfit/lmmin.c → contrib/lmfit/lmmin.c
diff --git a/lmfit/lmmin.h → contrib/lmfit/lmmin.h b/lmfit/lmmin.h → contrib/lmfit/lmmin.h
diff --git a/lmfit/lmstruct.h → contrib/lmfit/lmstruct.h b/lmfit/lmstruct.h → contrib/lmfit/lmstruct.h
diff --git a/qtsolutions/codeeditor/codeeditor.cpp → ...rib/qtsolutions/codeeditor/codeeditor.cpp b/qtsolutions/codeeditor/codeeditor.cpp → ...rib/qtsolutions/codeeditor/codeeditor.cpp
diff --git a/qtsolutions/codeeditor/codeeditor.h → contrib/qtsolutions/codeeditor/codeeditor.h b/qtsolutions/codeeditor/codeeditor.h → contrib/qtsolutions/codeeditor/codeeditor.h
diff --git a/qtsolutions/common.pri → contrib/qtsolutions/common.pri b/qtsolutions/common.pri → contrib/qtsolutions/common.pri
diff --git a/qtsolutions/json/mvjson.cpp → contrib/qtsolutions/json/mvjson.cpp b/qtsolutions/json/mvjson.cpp → contrib/qtsolutions/json/mvjson.cpp
diff --git a/qtsolutions/json/mvjson.h → contrib/qtsolutions/json/mvjson.h b/qtsolutions/json/mvjson.h → contrib/qtsolutions/json/mvjson.h
diff --git a/...utions/qwtcurve/qwt_plot_gapped_curve.cpp → ...utions/qwtcurve/qwt_plot_gapped_curve.cpp b/...utions/qwtcurve/qwt_plot_gapped_curve.cpp → ...utions/qwtcurve/qwt_plot_gapped_curve.cpp
diff --git a/qtsolutions/qwtcurve/qwt_plot_gapped_curve.h → ...olutions/qwtcurve/qwt_plot_gapped_curve.h b/qtsolutions/qwtcurve/qwt_plot_gapped_curve.h → ...olutions/qwtcurve/qwt_plot_gapped_curve.h
diff --git a/...tions/segmentcontrol/qtsegmentcontrol.cpp → ...tions/segmentcontrol/qtsegmentcontrol.cpp b/...tions/segmentcontrol/qtsegmentcontrol.cpp → ...tions/segmentcontrol/qtsegmentcontrol.cpp
diff --git a/...lutions/segmentcontrol/qtsegmentcontrol.h → ...lutions/segmentcontrol/qtsegmentcontrol.h b/...lutions/segmentcontrol/qtsegmentcontrol.h → ...lutions/segmentcontrol/qtsegmentcontrol.h
diff --git a/qtsolutions/soap/QtSoapArray → contrib/qtsolutions/soap/QtSoapArray b/qtsolutions/soap/QtSoapArray → contrib/qtsolutions/soap/QtSoapArray
diff --git a/qtsolutions/soap/QtSoapArrayIterator → contrib/qtsolutions/soap/QtSoapArrayIterator b/qtsolutions/soap/QtSoapArrayIterator → contrib/qtsolutions/soap/QtSoapArrayIterator
diff --git a/qtsolutions/soap/QtSoapHttpTransport → contrib/qtsolutions/soap/QtSoapHttpTransport b/qtsolutions/soap/QtSoapHttpTransport → contrib/qtsolutions/soap/QtSoapHttpTransport
diff --git a/qtsolutions/soap/QtSoapMessage → contrib/qtsolutions/soap/QtSoapMessage b/qtsolutions/soap/QtSoapMessage → contrib/qtsolutions/soap/QtSoapMessage
diff --git a/qtsolutions/soap/QtSoapNamespaces → contrib/qtsolutions/soap/QtSoapNamespaces b/qtsolutions/soap/QtSoapNamespaces → contrib/qtsolutions/soap/QtSoapNamespaces
diff --git a/qtsolutions/soap/QtSoapQName → contrib/qtsolutions/soap/QtSoapQName b/qtsolutions/soap/QtSoapQName → contrib/qtsolutions/soap/QtSoapQName
diff --git a/qtsolutions/soap/QtSoapSimpleType → contrib/qtsolutions/soap/QtSoapSimpleType b/qtsolutions/soap/QtSoapSimpleType → contrib/qtsolutions/soap/QtSoapSimpleType
diff --git a/qtsolutions/soap/QtSoapStruct → contrib/qtsolutions/soap/QtSoapStruct b/qtsolutions/soap/QtSoapStruct → contrib/qtsolutions/soap/QtSoapStruct
diff --git a/qtsolutions/soap/QtSoapStructIterator → ...rib/qtsolutions/soap/QtSoapStructIterator b/qtsolutions/soap/QtSoapStructIterator → ...rib/qtsolutions/soap/QtSoapStructIterator
diff --git a/qtsolutions/soap/QtSoapType → contrib/qtsolutions/soap/QtSoapType b/qtsolutions/soap/QtSoapType → contrib/qtsolutions/soap/QtSoapType
diff --git a/qtsolutions/soap/QtSoapTypeConstructor → ...ib/qtsolutions/soap/QtSoapTypeConstructor b/qtsolutions/soap/QtSoapTypeConstructor → ...ib/qtsolutions/soap/QtSoapTypeConstructor
diff --git a/qtsolutions/soap/QtSoapTypeConstructorBase → ...tsolutions/soap/QtSoapTypeConstructorBase b/qtsolutions/soap/QtSoapTypeConstructorBase → ...tsolutions/soap/QtSoapTypeConstructorBase
diff --git a/qtsolutions/soap/QtSoapTypeFactory → contrib/qtsolutions/soap/QtSoapTypeFactory b/qtsolutions/soap/QtSoapTypeFactory → contrib/qtsolutions/soap/QtSoapTypeFactory
diff --git a/qtsolutions/soap/qtsoap.cpp → contrib/qtsolutions/soap/qtsoap.cpp b/qtsolutions/soap/qtsoap.cpp → contrib/qtsolutions/soap/qtsoap.cpp
diff --git a/qtsolutions/soap/qtsoap.h → contrib/qtsolutions/soap/qtsoap.h b/qtsolutions/soap/qtsoap.h → contrib/qtsolutions/soap/qtsoap.h
diff --git a/qtsolutions/soap/qtsoap.pri → contrib/qtsolutions/soap/qtsoap.pri b/qtsolutions/soap/qtsoap.pri → contrib/qtsolutions/soap/qtsoap.pri
diff --git a/qxt/src/qxtglobal.h → contrib/qxt/src/qxtglobal.h b/qxt/src/qxtglobal.h → contrib/qxt/src/qxtglobal.h
diff --git a/qxt/src/qxtnamespace.h → contrib/qxt/src/qxtnamespace.h b/qxt/src/qxtnamespace.h → contrib/qxt/src/qxtnamespace.h
diff --git a/qxt/src/qxtscheduleheaderwidget.cpp → contrib/qxt/src/qxtscheduleheaderwidget.cpp b/qxt/src/qxtscheduleheaderwidget.cpp → contrib/qxt/src/qxtscheduleheaderwidget.cpp
diff --git a/qxt/src/qxtscheduleheaderwidget.h → contrib/qxt/src/qxtscheduleheaderwidget.h b/qxt/src/qxtscheduleheaderwidget.h → contrib/qxt/src/qxtscheduleheaderwidget.h
diff --git a/qxt/src/qxtscheduleitemdelegate.cpp → contrib/qxt/src/qxtscheduleitemdelegate.cpp b/qxt/src/qxtscheduleitemdelegate.cpp → contrib/qxt/src/qxtscheduleitemdelegate.cpp
diff --git a/qxt/src/qxtscheduleitemdelegate.h → contrib/qxt/src/qxtscheduleitemdelegate.h b/qxt/src/qxtscheduleitemdelegate.h → contrib/qxt/src/qxtscheduleitemdelegate.h
diff --git a/qxt/src/qxtscheduleview.cpp → contrib/qxt/src/qxtscheduleview.cpp b/qxt/src/qxtscheduleview.cpp → contrib/qxt/src/qxtscheduleview.cpp
diff --git a/qxt/src/qxtscheduleview.h → contrib/qxt/src/qxtscheduleview.h b/qxt/src/qxtscheduleview.h → contrib/qxt/src/qxtscheduleview.h
diff --git a/qxt/src/qxtscheduleview_p.cpp → contrib/qxt/src/qxtscheduleview_p.cpp b/qxt/src/qxtscheduleview_p.cpp → contrib/qxt/src/qxtscheduleview_p.cpp
diff --git a/qxt/src/qxtscheduleview_p.h → contrib/qxt/src/qxtscheduleview_p.h b/qxt/src/qxtscheduleview_p.h → contrib/qxt/src/qxtscheduleview_p.h
diff --git a/qxt/src/qxtscheduleviewheadermodel_p.cpp → .../qxt/src/qxtscheduleviewheadermodel_p.cpp b/qxt/src/qxtscheduleviewheadermodel_p.cpp → .../qxt/src/qxtscheduleviewheadermodel_p.cpp
diff --git a/qxt/src/qxtscheduleviewheadermodel_p.h → ...ib/qxt/src/qxtscheduleviewheadermodel_p.h b/qxt/src/qxtscheduleviewheadermodel_p.h → ...ib/qxt/src/qxtscheduleviewheadermodel_p.h
diff --git a/qxt/src/qxtscheduleviewproxy.h → contrib/qxt/src/qxtscheduleviewproxy.h b/qxt/src/qxtscheduleviewproxy.h → contrib/qxt/src/qxtscheduleviewproxy.h
diff --git a/qxt/src/qxtspanslider.cpp → contrib/qxt/src/qxtspanslider.cpp b/qxt/src/qxtspanslider.cpp → contrib/qxt/src/qxtspanslider.cpp
diff --git a/qxt/src/qxtspanslider.h → contrib/qxt/src/qxtspanslider.h b/qxt/src/qxtspanslider.h → contrib/qxt/src/qxtspanslider.h
diff --git a/qxt/src/qxtspanslider_p.h → contrib/qxt/src/qxtspanslider_p.h b/qxt/src/qxtspanslider_p.h → contrib/qxt/src/qxtspanslider_p.h
diff --git a/qxt/src/qxtstringspinbox.cpp → contrib/qxt/src/qxtstringspinbox.cpp b/qxt/src/qxtstringspinbox.cpp → contrib/qxt/src/qxtstringspinbox.cpp
diff --git a/qxt/src/qxtstringspinbox.h → contrib/qxt/src/qxtstringspinbox.h b/qxt/src/qxtstringspinbox.h → contrib/qxt/src/qxtstringspinbox.h
diff --git a/qxt/src/qxtstyleoptionscheduleviewitem.cpp → ...xt/src/qxtstyleoptionscheduleviewitem.cpp b/qxt/src/qxtstyleoptionscheduleviewitem.cpp → ...xt/src/qxtstyleoptionscheduleviewitem.cpp
diff --git a/qxt/src/qxtstyleoptionscheduleviewitem.h → .../qxt/src/qxtstyleoptionscheduleviewitem.h b/qxt/src/qxtstyleoptionscheduleviewitem.h → .../qxt/src/qxtstyleoptionscheduleviewitem.h
diff --git a/qzip/zip.cpp → contrib/qzip/zip.cpp b/qzip/zip.cpp → contrib/qzip/zip.cpp
diff --git a/qzip/zipreader.h → contrib/qzip/zipreader.h b/qzip/zipreader.h → contrib/qzip/zipreader.h
diff --git a/qzip/zipwriter.h → contrib/qzip/zipwriter.h b/qzip/zipwriter.h → contrib/qzip/zipwriter.h
diff --git a/src/src.pro b/src/src.pro
@@ -6,6 +6,9 @@
 ###############################################################################
 
 !versionAtLeast(QT_VERSION, 5.13):error("Use at least Qt version 5.13")
+greaterThan(QT_MAJOR_VERSION, 5) {
+    error("Qt6 is unsupported whilst we wait for key dependencies to be included.")
+}
 
 ###==========================
 ### IMPORT USER CONFIGURATION
@@ -53,7 +56,8 @@ QMAKE_CFLAGS_ISYSTEM =
 ###=======================================================================
 
 # qwt, qxt, libz, json, lmfit and qwtcurve
-INCLUDEPATH += ../qwt/src ../qxt/src ../qtsolutions/json ../qtsolutions/qwtcurve ../lmfit ../levmar
+INCLUDEPATH += ../qwt/src ../contrib/qxt/src ../contrib/qtsolutions/json \
+               ../contrib/qtsolutions/qwtcurve ../contrib/lmfit ../contrib/levmar
 DEFINES += QXT_STATIC
 
 # to make sure we are toolchain neutral we NEVER refer to a lib
@@ -174,8 +178,8 @@ macx {
 }
 
 #### these are no longer non-mac only
-HEADERS += ../qtsolutions/segmentcontrol/qtsegmentcontrol.h
-SOURCES += ../qtsolutions/segmentcontrol/qtsegmentcontrol.cpp
+HEADERS += ../contrib/qtsolutions/segmentcontrol/qtsegmentcontrol.h
+SOURCES += ../contrib/qtsolutions/segmentcontrol/qtsegmentcontrol.cpp
 
 # X11
 if (defined(GC_WANT_X11)) {
@@ -498,42 +502,40 @@ contains(DEFINES, "GC_WANT_R") {
 
 
 ###==================================
-### OPTIONAL => HTTP API WEB SERVICES
+### HTTP API WEB SERVICES
 ###==================================
 
-!isEmpty (HTPATH) {
-
-    INCLUDEPATH += $$HTPATH
-    DEPENDPATH += $$HTPATH
-
-    DEFINES += GC_WANT_HTTP
-
-    HEADERS +=  Core/APIWebService.h
-    SOURCES +=  Core/APIWebService.cpp
-
-    HEADERS +=  $$HTPATH/httpglobal.h \
-                $$HTPATH/httplistener.h \
-                $$HTPATH/httpconnectionhandler.h \
-                $$HTPATH/httpconnectionhandlerpool.h \
-                $$HTPATH/httprequest.h \
-                $$HTPATH/httpresponse.h \
-                $$HTPATH/httpcookie.h \
-                $$HTPATH/httprequesthandler.h \
-                $$HTPATH/httpsession.h \
-                $$HTPATH/httpsessionstore.h \
-                $$HTPATH/staticfilecontroller.h
-    SOURCES +=  $$HTPATH/httpglobal.cpp \
-                $$HTPATH/httplistener.cpp \
-                $$HTPATH/httpconnectionhandler.cpp \
-                $$HTPATH/httpconnectionhandlerpool.cpp \
-                $$HTPATH/httprequest.cpp \
-                $$HTPATH/httpresponse.cpp \
-                $$HTPATH/httpcookie.cpp \
-                $$HTPATH/httprequesthandler.cpp \
-                $$HTPATH/httpsession.cpp \
-                $$HTPATH/httpsessionstore.cpp \
-                $$HTPATH/staticfilecontroller.cpp
-}
+HTPATH = ../contrib/httpserver
+INCLUDEPATH += $$HTPATH
+DEPENDPATH += $$HTPATH
+
+DEFINES += GC_WANT_HTTP
+
+HEADERS +=  Core/APIWebService.h
+SOURCES +=  Core/APIWebService.cpp
+
+HEADERS +=  $$HTPATH/httpglobal.h \
+            $$HTPATH/httplistener.h \
+            $$HTPATH/httpconnectionhandler.h \
+            $$HTPATH/httpconnectionhandlerpool.h \
+            $$HTPATH/httprequest.h \
+            $$HTPATH/httpresponse.h \
+            $$HTPATH/httpcookie.h \
+            $$HTPATH/httprequesthandler.h \
+            $$HTPATH/httpsession.h \
+            $$HTPATH/httpsessionstore.h \
+            $$HTPATH/staticfilecontroller.h
+SOURCES +=  $$HTPATH/httpglobal.cpp \
+            $$HTPATH/httplistener.cpp \
+            $$HTPATH/httpconnectionhandler.cpp \
+            $$HTPATH/httpconnectionhandlerpool.cpp \
+            $$HTPATH/httprequest.cpp \
+            $$HTPATH/httpresponse.cpp \
+            $$HTPATH/httpcookie.cpp \
+            $$HTPATH/httprequesthandler.cpp \
+            $$HTPATH/httpsession.cpp \
+            $$HTPATH/httpsessionstore.cpp \
+            $$HTPATH/staticfilecontroller.cpp
 
 
 ###=====================================================
@@ -739,10 +741,12 @@ HEADERS += Metrics/Banister.h Metrics/CPSolver.h Metrics/Estimator.h Metrics/Ext
 HEADERS += Planning/PlanningWindow.h
 
 # contrib
-HEADERS += ../qtsolutions/codeeditor/codeeditor.h ../qtsolutions/json/mvjson.h ../qtsolutions/qwtcurve/qwt_plot_gapped_curve.h \
-           ../qxt/src/qxtspanslider.h ../qxt/src/qxtspanslider_p.h ../qxt/src/qxtstringspinbox.h ../qzip/zipreader.h \
-           ../qzip/zipwriter.h ../lmfit/lmcurve.h  ../lmfit/lmcurve_tyd.h  ../lmfit/lmmin.h  ../lmfit/lmstruct.h \
-           ../levmar/compiler.h  ../levmar/levmar.h  ../levmar/lm.h  ../levmar/misc.h
+HEADERS += ../contrib/qtsolutions/codeeditor/codeeditor.h ../contrib/qtsolutions/json/mvjson.h \
+           ../contrib/qtsolutions/qwtcurve/qwt_plot_gapped_curve.h  ../contrib/qxt/src/qxtspanslider.h \
+           ../contrib/qxt/src/qxtspanslider_p.h ../contrib/qxt/src/qxtstringspinbox.h ../contrib/qzip/zipreader.h \
+           ../contrib/qzip/zipwriter.h ../contrib/lmfit/lmcurve.h  ../contrib/lmfit/lmcurve_tyd.h \
+           ../contrib/lmfit/lmmin.h  ../contrib/lmfit/lmstruct.h \
+           ../contrib/levmar/compiler.h  ../contrib/levmar/levmar.h  ../contrib/levmar/lm.h  ../contrib/levmar/misc.h
 
 # Train View
 HEADERS += Train/AddDeviceWizard.h Train/CalibrationData.h Train/ComputrainerController.h Train/Computrainer.h Train/DeviceConfiguration.h \
@@ -840,13 +844,14 @@ SOURCES += Metrics/aBikeScore.cpp Metrics/aCoggan.cpp Metrics/AerobicDecoupling.
 SOURCES += Planning/PlanningWindow.cpp
 
 ## Contributed solutions
-SOURCES += ../qtsolutions/codeeditor/codeeditor.cpp ../qtsolutions/json/mvjson.cpp ../qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp \
-           ../qxt/src/qxtspanslider.cpp ../qxt/src/qxtstringspinbox.cpp ../qzip/zip.cpp \
-           ../lmfit/lmcurve.c ../lmfit/lmmin.c \
-           ../levmar/Axb.c ../levmar/lm_core.c ../levmar/lmbc_core.c \
-           ../levmar/lmblec_core.c ../levmar/lmbleic_core.c ../levmar/lmlec.c ../levmar/misc.c \
-           ../levmar/Axb_core.c ../levmar/lm.c ../levmar/lmbc.c ../levmar/lmblec.c ../levmar/lmbleic.c \
-           ../levmar/lmlec_core.c ../levmar/misc_core.c
+SOURCES += ../contrib/qtsolutions/codeeditor/codeeditor.cpp ../contrib/qtsolutions/json/mvjson.cpp \
+           ../contrib/qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp \
+           ../contrib/qxt/src/qxtspanslider.cpp ../contrib/qxt/src/qxtstringspinbox.cpp ../contrib/qzip/zip.cpp \
+           ../contrib/lmfit/lmcurve.c ../contrib/lmfit/lmmin.c \
+           ../contrib/levmar/Axb.c ../contrib/levmar/lm_core.c ../contrib/levmar/lmbc_core.c \
+           ../contrib/levmar/lmblec_core.c ../contrib/levmar/lmbleic_core.c ../contrib/levmar/lmlec.c ../contrib/levmar/misc.c \
+           ../contrib/levmar/Axb_core.c ../contrib/levmar/lm.c ../contrib/levmar/lmbc.c ../contrib/levmar/lmblec.c ../contrib/levmar/lmbleic.c \
+           ../contrib/levmar/lmlec_core.c ../contrib/levmar/misc_core.c
 
 ## Train View Components
 SOURCES += Train/AddDeviceWizard.cpp Train/CalibrationData.cpp Train/ComputrainerController.cpp Train/Computrainer.cpp Train/DeviceConfiguration.cpp \