From e1ac00b8604e40b70875cdae91a4c10fe53bd528 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sun, 16 May 2021 10:33:09 +0100 Subject: [PATCH] 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. --- .../httpserver}/httpconnectionhandler.cpp | 0 .../httpserver}/httpconnectionhandler.h | 0 .../httpserver}/httpconnectionhandlerpool.cpp | 0 .../httpserver}/httpconnectionhandlerpool.h | 0 .../httpserver}/httpcookie.cpp | 0 .../httpserver}/httpcookie.h | 0 .../httpserver}/httpglobal.cpp | 0 .../httpserver}/httpglobal.h | 0 .../httpserver}/httplistener.cpp | 0 .../httpserver}/httplistener.h | 0 .../httpserver}/httprequest.cpp | 0 .../httpserver}/httprequest.h | 0 .../httpserver}/httprequesthandler.cpp | 0 .../httpserver}/httprequesthandler.h | 0 .../httpserver}/httpresponse.cpp | 0 .../httpserver}/httpresponse.h | 0 .../httpserver}/httpserver.pri | 0 .../httpserver}/httpsession.cpp | 0 .../httpserver}/httpsession.h | 0 .../httpserver}/httpsessionstore.cpp | 0 .../httpserver}/httpsessionstore.h | 0 .../httpserver}/staticfilecontroller.cpp | 0 .../httpserver}/staticfilecontroller.h | 0 {levmar => contrib/levmar}/Axb.c | 0 {levmar => contrib/levmar}/Axb_core.c | 0 {levmar => contrib/levmar}/compiler.h | 0 {levmar => contrib/levmar}/levmar.h | 0 {levmar => contrib/levmar}/lm.c | 0 {levmar => contrib/levmar}/lm.h | 0 {levmar => contrib/levmar}/lm_core.c | 0 {levmar => contrib/levmar}/lmbc.c | 0 {levmar => contrib/levmar}/lmbc_core.c | 0 {levmar => contrib/levmar}/lmblec.c | 0 {levmar => contrib/levmar}/lmblec_core.c | 0 {levmar => contrib/levmar}/lmbleic.c | 0 {levmar => contrib/levmar}/lmbleic_core.c | 0 {levmar => contrib/levmar}/lmlec.c | 0 {levmar => contrib/levmar}/lmlec_core.c | 0 {levmar => contrib/levmar}/misc.c | 0 {levmar => contrib/levmar}/misc.h | 0 {levmar => contrib/levmar}/misc_core.c | 0 {lmfit => contrib/lmfit}/COPYING | 0 {lmfit => contrib/lmfit}/lmcurve.c | 0 {lmfit => contrib/lmfit}/lmcurve.h | 0 {lmfit => contrib/lmfit}/lmcurve_tyd.h | 0 {lmfit => contrib/lmfit}/lmmin.c | 0 {lmfit => contrib/lmfit}/lmmin.h | 0 {lmfit => contrib/lmfit}/lmstruct.h | 0 .../qtsolutions}/codeeditor/codeeditor.cpp | 0 .../qtsolutions}/codeeditor/codeeditor.h | 0 .../qtsolutions}/common.pri | 0 .../qtsolutions}/json/mvjson.cpp | 0 .../qtsolutions}/json/mvjson.h | 0 .../qwtcurve/qwt_plot_gapped_curve.cpp | 0 .../qwtcurve/qwt_plot_gapped_curve.h | 0 .../segmentcontrol/qtsegmentcontrol.cpp | 0 .../segmentcontrol/qtsegmentcontrol.h | 0 .../qtsolutions}/soap/QtSoapArray | 0 .../qtsolutions}/soap/QtSoapArrayIterator | 0 .../qtsolutions}/soap/QtSoapHttpTransport | 0 .../qtsolutions}/soap/QtSoapMessage | 0 .../qtsolutions}/soap/QtSoapNamespaces | 0 .../qtsolutions}/soap/QtSoapQName | 0 .../qtsolutions}/soap/QtSoapSimpleType | 0 .../qtsolutions}/soap/QtSoapStruct | 0 .../qtsolutions}/soap/QtSoapStructIterator | 0 .../qtsolutions}/soap/QtSoapType | 0 .../qtsolutions}/soap/QtSoapTypeConstructor | 0 .../soap/QtSoapTypeConstructorBase | 0 .../qtsolutions}/soap/QtSoapTypeFactory | 0 .../qtsolutions}/soap/qtsoap.cpp | 0 .../qtsolutions}/soap/qtsoap.h | 0 .../qtsolutions}/soap/qtsoap.pri | 0 {qxt => contrib/qxt}/src/qxtglobal.h | 0 {qxt => contrib/qxt}/src/qxtnamespace.h | 0 .../qxt}/src/qxtscheduleheaderwidget.cpp | 0 .../qxt}/src/qxtscheduleheaderwidget.h | 0 .../qxt}/src/qxtscheduleitemdelegate.cpp | 0 .../qxt}/src/qxtscheduleitemdelegate.h | 0 {qxt => contrib/qxt}/src/qxtscheduleview.cpp | 0 {qxt => contrib/qxt}/src/qxtscheduleview.h | 0 .../qxt}/src/qxtscheduleview_p.cpp | 0 {qxt => contrib/qxt}/src/qxtscheduleview_p.h | 0 .../qxt}/src/qxtscheduleviewheadermodel_p.cpp | 0 .../qxt}/src/qxtscheduleviewheadermodel_p.h | 0 .../qxt}/src/qxtscheduleviewproxy.h | 0 {qxt => contrib/qxt}/src/qxtspanslider.cpp | 0 {qxt => contrib/qxt}/src/qxtspanslider.h | 0 {qxt => contrib/qxt}/src/qxtspanslider_p.h | 0 {qxt => contrib/qxt}/src/qxtstringspinbox.cpp | 0 {qxt => contrib/qxt}/src/qxtstringspinbox.h | 0 .../src/qxtstyleoptionscheduleviewitem.cpp | 0 .../qxt}/src/qxtstyleoptionscheduleviewitem.h | 0 {qzip => contrib/qzip}/zip.cpp | 0 {qzip => contrib/qzip}/zipreader.h | 0 {qzip => contrib/qzip}/zipwriter.h | 0 src/src.pro | 95 ++++++++++--------- 97 files changed, 50 insertions(+), 45 deletions(-) rename {httpserver => contrib/httpserver}/httpconnectionhandler.cpp (100%) rename {httpserver => contrib/httpserver}/httpconnectionhandler.h (100%) rename {httpserver => contrib/httpserver}/httpconnectionhandlerpool.cpp (100%) rename {httpserver => contrib/httpserver}/httpconnectionhandlerpool.h (100%) rename {httpserver => contrib/httpserver}/httpcookie.cpp (100%) rename {httpserver => contrib/httpserver}/httpcookie.h (100%) rename {httpserver => contrib/httpserver}/httpglobal.cpp (100%) rename {httpserver => contrib/httpserver}/httpglobal.h (100%) rename {httpserver => contrib/httpserver}/httplistener.cpp (100%) rename {httpserver => contrib/httpserver}/httplistener.h (100%) rename {httpserver => contrib/httpserver}/httprequest.cpp (100%) rename {httpserver => contrib/httpserver}/httprequest.h (100%) rename {httpserver => contrib/httpserver}/httprequesthandler.cpp (100%) rename {httpserver => contrib/httpserver}/httprequesthandler.h (100%) rename {httpserver => contrib/httpserver}/httpresponse.cpp (100%) rename {httpserver => contrib/httpserver}/httpresponse.h (100%) rename {httpserver => contrib/httpserver}/httpserver.pri (100%) rename {httpserver => contrib/httpserver}/httpsession.cpp (100%) rename {httpserver => contrib/httpserver}/httpsession.h (100%) rename {httpserver => contrib/httpserver}/httpsessionstore.cpp (100%) rename {httpserver => contrib/httpserver}/httpsessionstore.h (100%) rename {httpserver => contrib/httpserver}/staticfilecontroller.cpp (100%) rename {httpserver => contrib/httpserver}/staticfilecontroller.h (100%) rename {levmar => contrib/levmar}/Axb.c (100%) rename {levmar => contrib/levmar}/Axb_core.c (100%) rename {levmar => contrib/levmar}/compiler.h (100%) rename {levmar => contrib/levmar}/levmar.h (100%) rename {levmar => contrib/levmar}/lm.c (100%) rename {levmar => contrib/levmar}/lm.h (100%) rename {levmar => contrib/levmar}/lm_core.c (100%) rename {levmar => contrib/levmar}/lmbc.c (100%) rename {levmar => contrib/levmar}/lmbc_core.c (100%) rename {levmar => contrib/levmar}/lmblec.c (100%) rename {levmar => contrib/levmar}/lmblec_core.c (100%) rename {levmar => contrib/levmar}/lmbleic.c (100%) rename {levmar => contrib/levmar}/lmbleic_core.c (100%) rename {levmar => contrib/levmar}/lmlec.c (100%) rename {levmar => contrib/levmar}/lmlec_core.c (100%) rename {levmar => contrib/levmar}/misc.c (100%) rename {levmar => contrib/levmar}/misc.h (100%) rename {levmar => contrib/levmar}/misc_core.c (100%) rename {lmfit => contrib/lmfit}/COPYING (100%) rename {lmfit => contrib/lmfit}/lmcurve.c (100%) rename {lmfit => contrib/lmfit}/lmcurve.h (100%) rename {lmfit => contrib/lmfit}/lmcurve_tyd.h (100%) rename {lmfit => contrib/lmfit}/lmmin.c (100%) rename {lmfit => contrib/lmfit}/lmmin.h (100%) rename {lmfit => contrib/lmfit}/lmstruct.h (100%) rename {qtsolutions => contrib/qtsolutions}/codeeditor/codeeditor.cpp (100%) rename {qtsolutions => contrib/qtsolutions}/codeeditor/codeeditor.h (100%) rename {qtsolutions => contrib/qtsolutions}/common.pri (100%) rename {qtsolutions => contrib/qtsolutions}/json/mvjson.cpp (100%) rename {qtsolutions => contrib/qtsolutions}/json/mvjson.h (100%) rename {qtsolutions => contrib/qtsolutions}/qwtcurve/qwt_plot_gapped_curve.cpp (100%) rename {qtsolutions => contrib/qtsolutions}/qwtcurve/qwt_plot_gapped_curve.h (100%) rename {qtsolutions => contrib/qtsolutions}/segmentcontrol/qtsegmentcontrol.cpp (100%) rename {qtsolutions => contrib/qtsolutions}/segmentcontrol/qtsegmentcontrol.h (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapArray (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapArrayIterator (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapHttpTransport (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapMessage (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapNamespaces (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapQName (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapSimpleType (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapStruct (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapStructIterator (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapType (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapTypeConstructor (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapTypeConstructorBase (100%) rename {qtsolutions => contrib/qtsolutions}/soap/QtSoapTypeFactory (100%) rename {qtsolutions => contrib/qtsolutions}/soap/qtsoap.cpp (100%) rename {qtsolutions => contrib/qtsolutions}/soap/qtsoap.h (100%) rename {qtsolutions => contrib/qtsolutions}/soap/qtsoap.pri (100%) rename {qxt => contrib/qxt}/src/qxtglobal.h (100%) rename {qxt => contrib/qxt}/src/qxtnamespace.h (100%) rename {qxt => contrib/qxt}/src/qxtscheduleheaderwidget.cpp (100%) rename {qxt => contrib/qxt}/src/qxtscheduleheaderwidget.h (100%) rename {qxt => contrib/qxt}/src/qxtscheduleitemdelegate.cpp (100%) rename {qxt => contrib/qxt}/src/qxtscheduleitemdelegate.h (100%) rename {qxt => contrib/qxt}/src/qxtscheduleview.cpp (100%) rename {qxt => contrib/qxt}/src/qxtscheduleview.h (100%) rename {qxt => contrib/qxt}/src/qxtscheduleview_p.cpp (100%) rename {qxt => contrib/qxt}/src/qxtscheduleview_p.h (100%) rename {qxt => contrib/qxt}/src/qxtscheduleviewheadermodel_p.cpp (100%) rename {qxt => contrib/qxt}/src/qxtscheduleviewheadermodel_p.h (100%) rename {qxt => contrib/qxt}/src/qxtscheduleviewproxy.h (100%) rename {qxt => contrib/qxt}/src/qxtspanslider.cpp (100%) rename {qxt => contrib/qxt}/src/qxtspanslider.h (100%) rename {qxt => contrib/qxt}/src/qxtspanslider_p.h (100%) rename {qxt => contrib/qxt}/src/qxtstringspinbox.cpp (100%) rename {qxt => contrib/qxt}/src/qxtstringspinbox.h (100%) rename {qxt => contrib/qxt}/src/qxtstyleoptionscheduleviewitem.cpp (100%) rename {qxt => contrib/qxt}/src/qxtstyleoptionscheduleviewitem.h (100%) rename {qzip => contrib/qzip}/zip.cpp (100%) rename {qzip => contrib/qzip}/zipreader.h (100%) rename {qzip => contrib/qzip}/zipwriter.h (100%) diff --git a/httpserver/httpconnectionhandler.cpp b/contrib/httpserver/httpconnectionhandler.cpp similarity index 100% rename from httpserver/httpconnectionhandler.cpp rename to contrib/httpserver/httpconnectionhandler.cpp diff --git a/httpserver/httpconnectionhandler.h b/contrib/httpserver/httpconnectionhandler.h similarity index 100% rename from httpserver/httpconnectionhandler.h rename to contrib/httpserver/httpconnectionhandler.h diff --git a/httpserver/httpconnectionhandlerpool.cpp b/contrib/httpserver/httpconnectionhandlerpool.cpp similarity index 100% rename from httpserver/httpconnectionhandlerpool.cpp rename to contrib/httpserver/httpconnectionhandlerpool.cpp diff --git a/httpserver/httpconnectionhandlerpool.h b/contrib/httpserver/httpconnectionhandlerpool.h similarity index 100% rename from httpserver/httpconnectionhandlerpool.h rename to contrib/httpserver/httpconnectionhandlerpool.h diff --git a/httpserver/httpcookie.cpp b/contrib/httpserver/httpcookie.cpp similarity index 100% rename from httpserver/httpcookie.cpp rename to contrib/httpserver/httpcookie.cpp diff --git a/httpserver/httpcookie.h b/contrib/httpserver/httpcookie.h similarity index 100% rename from httpserver/httpcookie.h rename to contrib/httpserver/httpcookie.h diff --git a/httpserver/httpglobal.cpp b/contrib/httpserver/httpglobal.cpp similarity index 100% rename from httpserver/httpglobal.cpp rename to contrib/httpserver/httpglobal.cpp diff --git a/httpserver/httpglobal.h b/contrib/httpserver/httpglobal.h similarity index 100% rename from httpserver/httpglobal.h rename to contrib/httpserver/httpglobal.h diff --git a/httpserver/httplistener.cpp b/contrib/httpserver/httplistener.cpp similarity index 100% rename from httpserver/httplistener.cpp rename to contrib/httpserver/httplistener.cpp diff --git a/httpserver/httplistener.h b/contrib/httpserver/httplistener.h similarity index 100% rename from httpserver/httplistener.h rename to contrib/httpserver/httplistener.h diff --git a/httpserver/httprequest.cpp b/contrib/httpserver/httprequest.cpp similarity index 100% rename from httpserver/httprequest.cpp rename to contrib/httpserver/httprequest.cpp diff --git a/httpserver/httprequest.h b/contrib/httpserver/httprequest.h similarity index 100% rename from httpserver/httprequest.h rename to contrib/httpserver/httprequest.h diff --git a/httpserver/httprequesthandler.cpp b/contrib/httpserver/httprequesthandler.cpp similarity index 100% rename from httpserver/httprequesthandler.cpp rename to contrib/httpserver/httprequesthandler.cpp diff --git a/httpserver/httprequesthandler.h b/contrib/httpserver/httprequesthandler.h similarity index 100% rename from httpserver/httprequesthandler.h rename to contrib/httpserver/httprequesthandler.h diff --git a/httpserver/httpresponse.cpp b/contrib/httpserver/httpresponse.cpp similarity index 100% rename from httpserver/httpresponse.cpp rename to contrib/httpserver/httpresponse.cpp diff --git a/httpserver/httpresponse.h b/contrib/httpserver/httpresponse.h similarity index 100% rename from httpserver/httpresponse.h rename to contrib/httpserver/httpresponse.h diff --git a/httpserver/httpserver.pri b/contrib/httpserver/httpserver.pri similarity index 100% rename from httpserver/httpserver.pri rename to contrib/httpserver/httpserver.pri diff --git a/httpserver/httpsession.cpp b/contrib/httpserver/httpsession.cpp similarity index 100% rename from httpserver/httpsession.cpp rename to contrib/httpserver/httpsession.cpp diff --git a/httpserver/httpsession.h b/contrib/httpserver/httpsession.h similarity index 100% rename from httpserver/httpsession.h rename to contrib/httpserver/httpsession.h diff --git a/httpserver/httpsessionstore.cpp b/contrib/httpserver/httpsessionstore.cpp similarity index 100% rename from httpserver/httpsessionstore.cpp rename to contrib/httpserver/httpsessionstore.cpp diff --git a/httpserver/httpsessionstore.h b/contrib/httpserver/httpsessionstore.h similarity index 100% rename from httpserver/httpsessionstore.h rename to contrib/httpserver/httpsessionstore.h diff --git a/httpserver/staticfilecontroller.cpp b/contrib/httpserver/staticfilecontroller.cpp similarity index 100% rename from httpserver/staticfilecontroller.cpp rename to contrib/httpserver/staticfilecontroller.cpp diff --git a/httpserver/staticfilecontroller.h b/contrib/httpserver/staticfilecontroller.h similarity index 100% rename from httpserver/staticfilecontroller.h rename to contrib/httpserver/staticfilecontroller.h diff --git a/levmar/Axb.c b/contrib/levmar/Axb.c similarity index 100% rename from levmar/Axb.c rename to contrib/levmar/Axb.c diff --git a/levmar/Axb_core.c b/contrib/levmar/Axb_core.c similarity index 100% rename from levmar/Axb_core.c rename to contrib/levmar/Axb_core.c diff --git a/levmar/compiler.h b/contrib/levmar/compiler.h similarity index 100% rename from levmar/compiler.h rename to contrib/levmar/compiler.h diff --git a/levmar/levmar.h b/contrib/levmar/levmar.h similarity index 100% rename from levmar/levmar.h rename to contrib/levmar/levmar.h diff --git a/levmar/lm.c b/contrib/levmar/lm.c similarity index 100% rename from levmar/lm.c rename to contrib/levmar/lm.c diff --git a/levmar/lm.h b/contrib/levmar/lm.h similarity index 100% rename from levmar/lm.h rename to contrib/levmar/lm.h diff --git a/levmar/lm_core.c b/contrib/levmar/lm_core.c similarity index 100% rename from levmar/lm_core.c rename to contrib/levmar/lm_core.c diff --git a/levmar/lmbc.c b/contrib/levmar/lmbc.c similarity index 100% rename from levmar/lmbc.c rename to contrib/levmar/lmbc.c diff --git a/levmar/lmbc_core.c b/contrib/levmar/lmbc_core.c similarity index 100% rename from levmar/lmbc_core.c rename to contrib/levmar/lmbc_core.c diff --git a/levmar/lmblec.c b/contrib/levmar/lmblec.c similarity index 100% rename from levmar/lmblec.c rename to contrib/levmar/lmblec.c diff --git a/levmar/lmblec_core.c b/contrib/levmar/lmblec_core.c similarity index 100% rename from levmar/lmblec_core.c rename to contrib/levmar/lmblec_core.c diff --git a/levmar/lmbleic.c b/contrib/levmar/lmbleic.c similarity index 100% rename from levmar/lmbleic.c rename to contrib/levmar/lmbleic.c diff --git a/levmar/lmbleic_core.c b/contrib/levmar/lmbleic_core.c similarity index 100% rename from levmar/lmbleic_core.c rename to contrib/levmar/lmbleic_core.c diff --git a/levmar/lmlec.c b/contrib/levmar/lmlec.c similarity index 100% rename from levmar/lmlec.c rename to contrib/levmar/lmlec.c diff --git a/levmar/lmlec_core.c b/contrib/levmar/lmlec_core.c similarity index 100% rename from levmar/lmlec_core.c rename to contrib/levmar/lmlec_core.c diff --git a/levmar/misc.c b/contrib/levmar/misc.c similarity index 100% rename from levmar/misc.c rename to contrib/levmar/misc.c diff --git a/levmar/misc.h b/contrib/levmar/misc.h similarity index 100% rename from levmar/misc.h rename to contrib/levmar/misc.h diff --git a/levmar/misc_core.c b/contrib/levmar/misc_core.c similarity index 100% rename from levmar/misc_core.c rename to contrib/levmar/misc_core.c diff --git a/lmfit/COPYING b/contrib/lmfit/COPYING similarity index 100% rename from lmfit/COPYING rename to contrib/lmfit/COPYING diff --git a/lmfit/lmcurve.c b/contrib/lmfit/lmcurve.c similarity index 100% rename from lmfit/lmcurve.c rename to contrib/lmfit/lmcurve.c diff --git a/lmfit/lmcurve.h b/contrib/lmfit/lmcurve.h similarity index 100% rename from lmfit/lmcurve.h rename to contrib/lmfit/lmcurve.h diff --git a/lmfit/lmcurve_tyd.h b/contrib/lmfit/lmcurve_tyd.h similarity index 100% rename from lmfit/lmcurve_tyd.h rename to contrib/lmfit/lmcurve_tyd.h diff --git a/lmfit/lmmin.c b/contrib/lmfit/lmmin.c similarity index 100% rename from lmfit/lmmin.c rename to contrib/lmfit/lmmin.c diff --git a/lmfit/lmmin.h b/contrib/lmfit/lmmin.h similarity index 100% rename from lmfit/lmmin.h rename to contrib/lmfit/lmmin.h diff --git a/lmfit/lmstruct.h b/contrib/lmfit/lmstruct.h similarity index 100% rename from lmfit/lmstruct.h rename to contrib/lmfit/lmstruct.h diff --git a/qtsolutions/codeeditor/codeeditor.cpp b/contrib/qtsolutions/codeeditor/codeeditor.cpp similarity index 100% rename from qtsolutions/codeeditor/codeeditor.cpp rename to contrib/qtsolutions/codeeditor/codeeditor.cpp diff --git a/qtsolutions/codeeditor/codeeditor.h b/contrib/qtsolutions/codeeditor/codeeditor.h similarity index 100% rename from qtsolutions/codeeditor/codeeditor.h rename to contrib/qtsolutions/codeeditor/codeeditor.h diff --git a/qtsolutions/common.pri b/contrib/qtsolutions/common.pri similarity index 100% rename from qtsolutions/common.pri rename to contrib/qtsolutions/common.pri diff --git a/qtsolutions/json/mvjson.cpp b/contrib/qtsolutions/json/mvjson.cpp similarity index 100% rename from qtsolutions/json/mvjson.cpp rename to contrib/qtsolutions/json/mvjson.cpp diff --git a/qtsolutions/json/mvjson.h b/contrib/qtsolutions/json/mvjson.h similarity index 100% rename from qtsolutions/json/mvjson.h rename to contrib/qtsolutions/json/mvjson.h diff --git a/qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp b/contrib/qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp similarity index 100% rename from qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp rename to contrib/qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp diff --git a/qtsolutions/qwtcurve/qwt_plot_gapped_curve.h b/contrib/qtsolutions/qwtcurve/qwt_plot_gapped_curve.h similarity index 100% rename from qtsolutions/qwtcurve/qwt_plot_gapped_curve.h rename to contrib/qtsolutions/qwtcurve/qwt_plot_gapped_curve.h diff --git a/qtsolutions/segmentcontrol/qtsegmentcontrol.cpp b/contrib/qtsolutions/segmentcontrol/qtsegmentcontrol.cpp similarity index 100% rename from qtsolutions/segmentcontrol/qtsegmentcontrol.cpp rename to contrib/qtsolutions/segmentcontrol/qtsegmentcontrol.cpp diff --git a/qtsolutions/segmentcontrol/qtsegmentcontrol.h b/contrib/qtsolutions/segmentcontrol/qtsegmentcontrol.h similarity index 100% rename from qtsolutions/segmentcontrol/qtsegmentcontrol.h rename to contrib/qtsolutions/segmentcontrol/qtsegmentcontrol.h diff --git a/qtsolutions/soap/QtSoapArray b/contrib/qtsolutions/soap/QtSoapArray similarity index 100% rename from qtsolutions/soap/QtSoapArray rename to contrib/qtsolutions/soap/QtSoapArray diff --git a/qtsolutions/soap/QtSoapArrayIterator b/contrib/qtsolutions/soap/QtSoapArrayIterator similarity index 100% rename from qtsolutions/soap/QtSoapArrayIterator rename to contrib/qtsolutions/soap/QtSoapArrayIterator diff --git a/qtsolutions/soap/QtSoapHttpTransport b/contrib/qtsolutions/soap/QtSoapHttpTransport similarity index 100% rename from qtsolutions/soap/QtSoapHttpTransport rename to contrib/qtsolutions/soap/QtSoapHttpTransport diff --git a/qtsolutions/soap/QtSoapMessage b/contrib/qtsolutions/soap/QtSoapMessage similarity index 100% rename from qtsolutions/soap/QtSoapMessage rename to contrib/qtsolutions/soap/QtSoapMessage diff --git a/qtsolutions/soap/QtSoapNamespaces b/contrib/qtsolutions/soap/QtSoapNamespaces similarity index 100% rename from qtsolutions/soap/QtSoapNamespaces rename to contrib/qtsolutions/soap/QtSoapNamespaces diff --git a/qtsolutions/soap/QtSoapQName b/contrib/qtsolutions/soap/QtSoapQName similarity index 100% rename from qtsolutions/soap/QtSoapQName rename to contrib/qtsolutions/soap/QtSoapQName diff --git a/qtsolutions/soap/QtSoapSimpleType b/contrib/qtsolutions/soap/QtSoapSimpleType similarity index 100% rename from qtsolutions/soap/QtSoapSimpleType rename to contrib/qtsolutions/soap/QtSoapSimpleType diff --git a/qtsolutions/soap/QtSoapStruct b/contrib/qtsolutions/soap/QtSoapStruct similarity index 100% rename from qtsolutions/soap/QtSoapStruct rename to contrib/qtsolutions/soap/QtSoapStruct diff --git a/qtsolutions/soap/QtSoapStructIterator b/contrib/qtsolutions/soap/QtSoapStructIterator similarity index 100% rename from qtsolutions/soap/QtSoapStructIterator rename to contrib/qtsolutions/soap/QtSoapStructIterator diff --git a/qtsolutions/soap/QtSoapType b/contrib/qtsolutions/soap/QtSoapType similarity index 100% rename from qtsolutions/soap/QtSoapType rename to contrib/qtsolutions/soap/QtSoapType diff --git a/qtsolutions/soap/QtSoapTypeConstructor b/contrib/qtsolutions/soap/QtSoapTypeConstructor similarity index 100% rename from qtsolutions/soap/QtSoapTypeConstructor rename to contrib/qtsolutions/soap/QtSoapTypeConstructor diff --git a/qtsolutions/soap/QtSoapTypeConstructorBase b/contrib/qtsolutions/soap/QtSoapTypeConstructorBase similarity index 100% rename from qtsolutions/soap/QtSoapTypeConstructorBase rename to contrib/qtsolutions/soap/QtSoapTypeConstructorBase diff --git a/qtsolutions/soap/QtSoapTypeFactory b/contrib/qtsolutions/soap/QtSoapTypeFactory similarity index 100% rename from qtsolutions/soap/QtSoapTypeFactory rename to contrib/qtsolutions/soap/QtSoapTypeFactory diff --git a/qtsolutions/soap/qtsoap.cpp b/contrib/qtsolutions/soap/qtsoap.cpp similarity index 100% rename from qtsolutions/soap/qtsoap.cpp rename to contrib/qtsolutions/soap/qtsoap.cpp diff --git a/qtsolutions/soap/qtsoap.h b/contrib/qtsolutions/soap/qtsoap.h similarity index 100% rename from qtsolutions/soap/qtsoap.h rename to contrib/qtsolutions/soap/qtsoap.h diff --git a/qtsolutions/soap/qtsoap.pri b/contrib/qtsolutions/soap/qtsoap.pri similarity index 100% rename from qtsolutions/soap/qtsoap.pri rename to contrib/qtsolutions/soap/qtsoap.pri diff --git a/qxt/src/qxtglobal.h b/contrib/qxt/src/qxtglobal.h similarity index 100% rename from qxt/src/qxtglobal.h rename to contrib/qxt/src/qxtglobal.h diff --git a/qxt/src/qxtnamespace.h b/contrib/qxt/src/qxtnamespace.h similarity index 100% rename from qxt/src/qxtnamespace.h rename to contrib/qxt/src/qxtnamespace.h diff --git a/qxt/src/qxtscheduleheaderwidget.cpp b/contrib/qxt/src/qxtscheduleheaderwidget.cpp similarity index 100% rename from qxt/src/qxtscheduleheaderwidget.cpp rename to contrib/qxt/src/qxtscheduleheaderwidget.cpp diff --git a/qxt/src/qxtscheduleheaderwidget.h b/contrib/qxt/src/qxtscheduleheaderwidget.h similarity index 100% rename from qxt/src/qxtscheduleheaderwidget.h rename to contrib/qxt/src/qxtscheduleheaderwidget.h diff --git a/qxt/src/qxtscheduleitemdelegate.cpp b/contrib/qxt/src/qxtscheduleitemdelegate.cpp similarity index 100% rename from qxt/src/qxtscheduleitemdelegate.cpp rename to contrib/qxt/src/qxtscheduleitemdelegate.cpp diff --git a/qxt/src/qxtscheduleitemdelegate.h b/contrib/qxt/src/qxtscheduleitemdelegate.h similarity index 100% rename from qxt/src/qxtscheduleitemdelegate.h rename to contrib/qxt/src/qxtscheduleitemdelegate.h diff --git a/qxt/src/qxtscheduleview.cpp b/contrib/qxt/src/qxtscheduleview.cpp similarity index 100% rename from qxt/src/qxtscheduleview.cpp rename to contrib/qxt/src/qxtscheduleview.cpp diff --git a/qxt/src/qxtscheduleview.h b/contrib/qxt/src/qxtscheduleview.h similarity index 100% rename from qxt/src/qxtscheduleview.h rename to contrib/qxt/src/qxtscheduleview.h diff --git a/qxt/src/qxtscheduleview_p.cpp b/contrib/qxt/src/qxtscheduleview_p.cpp similarity index 100% rename from qxt/src/qxtscheduleview_p.cpp rename to contrib/qxt/src/qxtscheduleview_p.cpp diff --git a/qxt/src/qxtscheduleview_p.h b/contrib/qxt/src/qxtscheduleview_p.h similarity index 100% rename from qxt/src/qxtscheduleview_p.h rename to contrib/qxt/src/qxtscheduleview_p.h diff --git a/qxt/src/qxtscheduleviewheadermodel_p.cpp b/contrib/qxt/src/qxtscheduleviewheadermodel_p.cpp similarity index 100% rename from qxt/src/qxtscheduleviewheadermodel_p.cpp rename to contrib/qxt/src/qxtscheduleviewheadermodel_p.cpp diff --git a/qxt/src/qxtscheduleviewheadermodel_p.h b/contrib/qxt/src/qxtscheduleviewheadermodel_p.h similarity index 100% rename from qxt/src/qxtscheduleviewheadermodel_p.h rename to contrib/qxt/src/qxtscheduleviewheadermodel_p.h diff --git a/qxt/src/qxtscheduleviewproxy.h b/contrib/qxt/src/qxtscheduleviewproxy.h similarity index 100% rename from qxt/src/qxtscheduleviewproxy.h rename to contrib/qxt/src/qxtscheduleviewproxy.h diff --git a/qxt/src/qxtspanslider.cpp b/contrib/qxt/src/qxtspanslider.cpp similarity index 100% rename from qxt/src/qxtspanslider.cpp rename to contrib/qxt/src/qxtspanslider.cpp diff --git a/qxt/src/qxtspanslider.h b/contrib/qxt/src/qxtspanslider.h similarity index 100% rename from qxt/src/qxtspanslider.h rename to contrib/qxt/src/qxtspanslider.h diff --git a/qxt/src/qxtspanslider_p.h b/contrib/qxt/src/qxtspanslider_p.h similarity index 100% rename from qxt/src/qxtspanslider_p.h rename to contrib/qxt/src/qxtspanslider_p.h diff --git a/qxt/src/qxtstringspinbox.cpp b/contrib/qxt/src/qxtstringspinbox.cpp similarity index 100% rename from qxt/src/qxtstringspinbox.cpp rename to contrib/qxt/src/qxtstringspinbox.cpp diff --git a/qxt/src/qxtstringspinbox.h b/contrib/qxt/src/qxtstringspinbox.h similarity index 100% rename from qxt/src/qxtstringspinbox.h rename to contrib/qxt/src/qxtstringspinbox.h diff --git a/qxt/src/qxtstyleoptionscheduleviewitem.cpp b/contrib/qxt/src/qxtstyleoptionscheduleviewitem.cpp similarity index 100% rename from qxt/src/qxtstyleoptionscheduleviewitem.cpp rename to contrib/qxt/src/qxtstyleoptionscheduleviewitem.cpp diff --git a/qxt/src/qxtstyleoptionscheduleviewitem.h b/contrib/qxt/src/qxtstyleoptionscheduleviewitem.h similarity index 100% rename from qxt/src/qxtstyleoptionscheduleviewitem.h rename to contrib/qxt/src/qxtstyleoptionscheduleviewitem.h diff --git a/qzip/zip.cpp b/contrib/qzip/zip.cpp similarity index 100% rename from qzip/zip.cpp rename to contrib/qzip/zip.cpp diff --git a/qzip/zipreader.h b/contrib/qzip/zipreader.h similarity index 100% rename from qzip/zipreader.h rename to contrib/qzip/zipreader.h diff --git a/qzip/zipwriter.h b/contrib/qzip/zipwriter.h similarity index 100% rename from qzip/zipwriter.h rename to contrib/qzip/zipwriter.h diff --git a/src/src.pro b/src/src.pro index c89427f7d..cad30982b 100644 --- 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) { +HTPATH = ../contrib/httpserver +INCLUDEPATH += $$HTPATH +DEPENDPATH += $$HTPATH - INCLUDEPATH += $$HTPATH - DEPENDPATH += $$HTPATH +DEFINES += GC_WANT_HTTP - DEFINES += GC_WANT_HTTP +HEADERS += Core/APIWebService.h +SOURCES += Core/APIWebService.cpp - 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 -} +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 \