diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2021-06-02 09:22:12 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2021-06-02 21:18:15 +0200 |
| commit | 6708c9ca5a282b1f830239d39be95efbab451ab8 (patch) | |
| tree | 0d4bcae57e1b351652be8b0f2951e7e8decf05ba /src | |
| parent | 19648f59ff339d986efca274be0d8093bc2178aa (diff) | |
| download | qtivi-6708c9ca5a282b1f830239d39be95efbab451ab8.tar.gz | |
Remove QMake project files
This includes removal of the corresponding .prev_CMakeLists.txt files.
Keep the pro files in the ivigenerator autotests.
Task-number: QTBUG-88742
Change-Id: Idbf40dc5f6469dbea37126ea9b46a6d521f43139
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src')
36 files changed, 0 insertions, 1537 deletions
diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt deleted file mode 100644 index b259b02..0000000 --- a/src/.prev_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Generated from src.pro. - -add_subdirectory(plugins) -add_subdirectory(imports) -add_subdirectory(doc) -if(QT_FEATURE_ivicore AND NOT QT_FEATURE_geniviextras_only AND NOT QT_FEATURE_host_tools_only) - add_subdirectory(ivicore) - add_subdirectory(helper) -endif() -if(QT_FEATURE_ivicore AND QT_FEATURE_ivigenerator AND QT_FEATURE_ivivehiclefunctions AND NOT QT_FEATURE_geniviextras_only AND NOT QT_FEATURE_host_tools_only) - add_subdirectory(ivivehiclefunctions) -endif() -if(QT_FEATURE_ivicore AND QT_FEATURE_ivimedia AND NOT QT_FEATURE_geniviextras_only AND NOT QT_FEATURE_host_tools_only) - add_subdirectory(ivimedia) -endif() -if(QT_FEATURE_geniviextras AND NOT QT_FEATURE_host_tools_only) - add_subdirectory(geniviextras) -endif() diff --git a/src/3rdparty/taglib/taglib.pri b/src/3rdparty/taglib/taglib.pri deleted file mode 100644 index dcf0aa0..0000000 --- a/src/3rdparty/taglib/taglib.pri +++ /dev/null @@ -1,261 +0,0 @@ -#Disable warnings in 3rdparty code due to unused arguments -win32-msvc* { - QMAKE_CXXFLAGS_WARN_ON += /wd4100 -} -*-g++* { - QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main -} -clang { - QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter -Wno-deprecated-declarations -Wno-sign-compare -Wno-delete-non-virtual-dtor -} - -DEFINES += TAGLIB_STATIC - -INCLUDEPATH += \ - $$PWD/ \ - $$PWD/taglib \ - $$PWD/taglib/taglib \ - $$PWD/taglib/taglib/ape \ - $$PWD/taglib/taglib/asf \ - $$PWD/taglib/taglib/flac \ - $$PWD/taglib/taglib/it \ - $$PWD/taglib/taglib/mod \ - $$PWD/taglib/taglib/mp4 \ - $$PWD/taglib/taglib/mpc \ - $$PWD/taglib/taglib/mpeg \ - $$PWD/taglib/taglib/mpeg/id3v1 \ - $$PWD/taglib/taglib/mpeg/id3v2 \ - $$PWD/taglib/taglib/mpeg/id3v2/frames \ - $$PWD/taglib/taglib/ogg \ - $$PWD/taglib/taglib/ogg/flac \ - $$PWD/taglib/taglib/ogg/opus \ - $$PWD/taglib/taglib/ogg/speex \ - $$PWD/taglib/taglib/ogg/vorbis \ - $$PWD/taglib/taglib/riff \ - $$PWD/taglib/taglib/riff/aiff \ - $$PWD/taglib/taglib/riff/wav \ - $$PWD/taglib/taglib/s3m \ - $$PWD/taglib/taglib/toolkit \ - $$PWD/taglib/taglib/trueaudio \ - $$PWD/taglib/taglib/wavpack \ - $$PWD/taglib/taglib/xm \ - - -HEADERS += \ - $$PWD/taglib/taglib/mp4/mp4properties.h \ - $$PWD/taglib/taglib/mp4/mp4file.h \ - $$PWD/taglib/taglib/mp4/mp4tag.h \ - $$PWD/taglib/taglib/mp4/mp4atom.h \ - $$PWD/taglib/taglib/mp4/mp4item.h \ - $$PWD/taglib/taglib/mp4/mp4coverart.h \ - $$PWD/taglib/taglib/tagutils.h \ - $$PWD/taglib/taglib/toolkit/tzlib.h \ - $$PWD/taglib/taglib/toolkit/tutils.h \ - $$PWD/taglib/taglib/toolkit/tdebuglistener.h \ - $$PWD/taglib/taglib/toolkit/tlist.h \ - $$PWD/taglib/taglib/toolkit/trefcounter.h \ - $$PWD/taglib/taglib/toolkit/tbytevectorstream.h \ - $$PWD/taglib/taglib/toolkit/tmap.h \ - $$PWD/taglib/taglib/toolkit/taglib.h \ - $$PWD/taglib/taglib/toolkit/tfilestream.h \ - $$PWD/taglib/taglib/toolkit/tpropertymap.h \ - $$PWD/taglib/taglib/toolkit/tstringlist.h \ - $$PWD/taglib/taglib/toolkit/tbytevector.h \ - $$PWD/taglib/taglib/toolkit/tbytevectorlist.h \ - $$PWD/taglib/taglib/toolkit/tdebug.h \ - $$PWD/taglib/taglib/toolkit/tstring.h \ - $$PWD/taglib/taglib/toolkit/tfile.h \ - $$PWD/taglib/taglib/toolkit/tiostream.h \ - $$PWD/taglib/taglib/audioproperties.h \ - $$PWD/taglib/taglib/xm/xmfile.h \ - $$PWD/taglib/taglib/xm/xmproperties.h \ - $$PWD/taglib/taglib/wavpack/wavpackproperties.h \ - $$PWD/taglib/taglib/wavpack/wavpackfile.h \ - $$PWD/taglib/taglib/tag.h \ - $$PWD/taglib/taglib/ape/apeproperties.h \ - $$PWD/taglib/taglib/ape/apetag.h \ - $$PWD/taglib/taglib/ape/apeitem.h \ - $$PWD/taglib/taglib/ape/apefile.h \ - $$PWD/taglib/taglib/ape/apefooter.h \ - $$PWD/taglib/taglib/tagunion.h \ - $$PWD/taglib/taglib/asf/asffile.h \ - $$PWD/taglib/taglib/asf/asftag.h \ - $$PWD/taglib/taglib/asf/asfpicture.h \ - $$PWD/taglib/taglib/asf/asfutils.h \ - $$PWD/taglib/taglib/asf/asfproperties.h \ - $$PWD/taglib/taglib/asf/asfattribute.h \ - $$PWD/taglib/taglib/it/itproperties.h \ - $$PWD/taglib/taglib/it/itfile.h \ - $$PWD/taglib/taglib/trueaudio/trueaudioproperties.h \ - $$PWD/taglib/taglib/trueaudio/trueaudiofile.h \ - $$PWD/taglib/taglib/s3m/s3mfile.h \ - $$PWD/taglib/taglib/s3m/s3mproperties.h \ - $$PWD/taglib/taglib/fileref.h \ - $$PWD/taglib/taglib/ogg/oggpageheader.h \ - $$PWD/taglib/taglib/ogg/oggfile.h \ - $$PWD/taglib/taglib/ogg/vorbis/vorbisproperties.h \ - $$PWD/taglib/taglib/ogg/vorbis/vorbisfile.h \ - $$PWD/taglib/taglib/ogg/speex/speexfile.h \ - $$PWD/taglib/taglib/ogg/speex/speexproperties.h \ - $$PWD/taglib/taglib/ogg/xiphcomment.h \ - $$PWD/taglib/taglib/ogg/opus/opusproperties.h \ - $$PWD/taglib/taglib/ogg/opus/opusfile.h \ - $$PWD/taglib/taglib/ogg/oggpage.h \ - $$PWD/taglib/taglib/ogg/flac/oggflacfile.h \ - $$PWD/taglib/taglib/mpc/mpcproperties.h \ - $$PWD/taglib/taglib/mpc/mpcfile.h \ - $$PWD/taglib/taglib/taglib_export.h \ - $$PWD/taglib/taglib/flac/flacunknownmetadatablock.h \ - $$PWD/taglib/taglib/flac/flacpicture.h \ - $$PWD/taglib/taglib/flac/flacmetadatablock.h \ - $$PWD/taglib/taglib/flac/flacproperties.h \ - $$PWD/taglib/taglib/flac/flacfile.h \ - $$PWD/taglib/taglib/mod/modfilebase.h \ - $$PWD/taglib/taglib/mod/modfileprivate.h \ - $$PWD/taglib/taglib/mod/modproperties.h \ - $$PWD/taglib/taglib/mod/modtag.h \ - $$PWD/taglib/taglib/mod/modfile.h \ - $$PWD/taglib/taglib/riff/riffutils.h \ - $$PWD/taglib/taglib/riff/aiff/aiffproperties.h \ - $$PWD/taglib/taglib/riff/aiff/aifffile.h \ - $$PWD/taglib/taglib/riff/rifffile.h \ - $$PWD/taglib/taglib/riff/wav/infotag.h \ - $$PWD/taglib/taglib/riff/wav/wavproperties.h \ - $$PWD/taglib/taglib/riff/wav/wavfile.h \ - $$PWD/taglib/taglib/mpeg/xingheader.h \ - $$PWD/taglib/taglib/mpeg/mpegproperties.h \ - $$PWD/taglib/taglib/mpeg/mpegheader.h \ - $$PWD/taglib/taglib/mpeg/mpegfile.h \ - $$PWD/taglib/taglib/mpeg/id3v1/id3v1genres.h \ - $$PWD/taglib/taglib/mpeg/id3v1/id3v1tag.h \ - $$PWD/taglib/taglib/mpeg/mpegutils.h \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2header.h \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2extendedheader.h \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2footer.h \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2tag.h \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2synchdata.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/urllinkframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/privateframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/commentsframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/podcastframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/unknownframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/chapterframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/ownershipframe.h \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2frame.h \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2framefactory.h \ - -SOURCES += \ - $$PWD/taglib/taglib/audioproperties.cpp \ - $$PWD/taglib/taglib/tagutils.cpp \ - $$PWD/taglib/taglib/mp4/mp4coverart.cpp \ - $$PWD/taglib/taglib/mp4/mp4tag.cpp \ - $$PWD/taglib/taglib/mp4/mp4file.cpp \ - $$PWD/taglib/taglib/mp4/mp4properties.cpp \ - $$PWD/taglib/taglib/mp4/mp4atom.cpp \ - $$PWD/taglib/taglib/mp4/mp4item.cpp \ - $$PWD/taglib/taglib/toolkit/tstring.cpp \ - $$PWD/taglib/taglib/toolkit/tpropertymap.cpp \ - $$PWD/taglib/taglib/toolkit/tbytevector.cpp \ - $$PWD/taglib/taglib/toolkit/tbytevectorstream.cpp \ - $$PWD/taglib/taglib/toolkit/tzlib.cpp \ - $$PWD/taglib/taglib/toolkit/tstringlist.cpp \ - $$PWD/taglib/taglib/toolkit/tiostream.cpp \ - $$PWD/taglib/taglib/toolkit/tfilestream.cpp \ - $$PWD/taglib/taglib/toolkit/trefcounter.cpp \ - $$PWD/taglib/taglib/toolkit/tdebug.cpp \ - $$PWD/taglib/taglib/toolkit/tbytevectorlist.cpp \ - $$PWD/taglib/taglib/toolkit/tfile.cpp \ - $$PWD/taglib/taglib/toolkit/tdebuglistener.cpp \ - $$PWD/taglib/taglib/xm/xmfile.cpp \ - $$PWD/taglib/taglib/xm/xmproperties.cpp \ - $$PWD/taglib/taglib/wavpack/wavpackproperties.cpp \ - $$PWD/taglib/taglib/wavpack/wavpackfile.cpp \ - $$PWD/taglib/taglib/ape/apeproperties.cpp \ - $$PWD/taglib/taglib/ape/apetag.cpp \ - $$PWD/taglib/taglib/ape/apefile.cpp \ - $$PWD/taglib/taglib/ape/apeitem.cpp \ - $$PWD/taglib/taglib/ape/apefooter.cpp \ - $$PWD/taglib/taglib/fileref.cpp \ - $$PWD/taglib/taglib/asf/asftag.cpp \ - $$PWD/taglib/taglib/asf/asffile.cpp \ - $$PWD/taglib/taglib/asf/asfproperties.cpp \ - $$PWD/taglib/taglib/asf/asfpicture.cpp \ - $$PWD/taglib/taglib/asf/asfattribute.cpp \ - $$PWD/taglib/taglib/it/itfile.cpp \ - $$PWD/taglib/taglib/it/itproperties.cpp \ - $$PWD/taglib/taglib/trueaudio/trueaudiofile.cpp \ - $$PWD/taglib/taglib/trueaudio/trueaudioproperties.cpp \ - $$PWD/taglib/taglib/s3m/s3mproperties.cpp \ - $$PWD/taglib/taglib/s3m/s3mfile.cpp \ - $$PWD/taglib/taglib/tagunion.cpp \ - $$PWD/taglib/taglib/ogg/oggfile.cpp \ - $$PWD/taglib/taglib/ogg/vorbis/vorbisfile.cpp \ - $$PWD/taglib/taglib/ogg/vorbis/vorbisproperties.cpp \ - $$PWD/taglib/taglib/ogg/oggpageheader.cpp \ - $$PWD/taglib/taglib/ogg/speex/speexproperties.cpp \ - $$PWD/taglib/taglib/ogg/speex/speexfile.cpp \ - $$PWD/taglib/taglib/ogg/xiphcomment.cpp \ - $$PWD/taglib/taglib/ogg/opus/opusproperties.cpp \ - $$PWD/taglib/taglib/ogg/opus/opusfile.cpp \ - $$PWD/taglib/taglib/ogg/oggpage.cpp \ - $$PWD/taglib/taglib/ogg/flac/oggflacfile.cpp \ - $$PWD/taglib/taglib/mpc/mpcfile.cpp \ - $$PWD/taglib/taglib/mpc/mpcproperties.cpp \ - $$PWD/taglib/taglib/flac/flacunknownmetadatablock.cpp \ - $$PWD/taglib/taglib/flac/flacmetadatablock.cpp \ - $$PWD/taglib/taglib/flac/flacpicture.cpp \ - $$PWD/taglib/taglib/flac/flacproperties.cpp \ - $$PWD/taglib/taglib/flac/flacfile.cpp \ - $$PWD/taglib/taglib/mod/modfile.cpp \ - $$PWD/taglib/taglib/mod/modtag.cpp \ - $$PWD/taglib/taglib/mod/modfilebase.cpp \ - $$PWD/taglib/taglib/mod/modproperties.cpp \ - $$PWD/taglib/taglib/tag.cpp \ - $$PWD/taglib/taglib/riff/rifffile.cpp \ - $$PWD/taglib/taglib/riff/aiff/aifffile.cpp \ - $$PWD/taglib/taglib/riff/aiff/aiffproperties.cpp \ - $$PWD/taglib/taglib/riff/wav/wavfile.cpp \ - $$PWD/taglib/taglib/riff/wav/infotag.cpp \ - $$PWD/taglib/taglib/riff/wav/wavproperties.cpp \ - $$PWD/taglib/taglib/mpeg/mpegproperties.cpp \ - $$PWD/taglib/taglib/mpeg/id3v1/id3v1tag.cpp \ - $$PWD/taglib/taglib/mpeg/id3v1/id3v1genres.cpp \ - $$PWD/taglib/taglib/mpeg/mpegheader.cpp \ - $$PWD/taglib/taglib/mpeg/mpegfile.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2synchdata.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2tag.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2extendedheader.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/chapterframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/urllinkframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/ownershipframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/privateframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/commentsframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/podcastframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/frames/unknownframe.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2header.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2frame.cpp \ - $$PWD/taglib/taglib/mpeg/id3v2/id3v2footer.cpp \ - $$PWD/taglib/taglib/mpeg/xingheader.cpp \ - -!win32: SOURCES += $$PWD/taglib/taglib/toolkit/unicode.cpp diff --git a/src/geniviextras/.prev_configure.cmake b/src/geniviextras/.prev_configure.cmake deleted file mode 100644 index ac4ba97..0000000 --- a/src/geniviextras/.prev_configure.cmake +++ /dev/null @@ -1,58 +0,0 @@ - - -#### Inputs - - - -#### Libraries - -qt_find_package(DLT PROVIDED_TARGETS DLT::DLT MODULE_NAME geniviextras QMAKE_LIB dlt) - - -#### Tests - - - -#### Features - -qt_feature("dlt" PRIVATE - LABEL "DLT" - AUTODETECT UNIX - CONDITION DLT_FOUND -) -qt_feature("dlt_2_12" PRIVATE - LABEL "DLT > 2.12" - AUTODETECT UNIX - CONDITION libs.dlt_2_12 OR FIXME -) -qt_feature("geniviextras-only" PRIVATE - LABEL "Only build Qt GENIVI Extras" - CONDITION INPUT_geniviextras_only STREQUAL 'yes' -) -qt_feature("geniviextras" PUBLIC - LABEL "Qt GENIVI Extras" - CONDITION QT_FEATURE_dlt -) -qt_configure_add_summary_section(NAME "Qt GENIVI Extras") -qt_configure_add_summary_entry(ARGS "dlt") -qt_configure_add_summary_entry(ARGS "dlt_2_12") -qt_configure_end_summary_section() # end of "Qt GENIVI Extras" section -qt_configure_add_summary_entry( - ARGS "geniviextras" - CONDITION NOT QT_FEATURE_geniviextras -) -qt_configure_add_report_entry( - TYPE NOTE - MESSAGE "No DLT libs found. Disabled building Qt GENIVI Extras." - CONDITION NOT QT_FEATURE_dlt -) -qt_configure_add_report_entry( - TYPE NOTE - MESSAGE "Old DLT version detected. Not all features of Qt GENIVI Extras can be enabled." - CONDITION QT_FEATURE_dlt AND NOT QT_FEATURE_dlt_2_12 -) -qt_configure_add_report_entry( - TYPE ERROR - MESSAGE "Mandatory dependency missing for only building Qt GENIVI Extras." - CONDITION NOT QT_FEATURE_dlt AND INPUT_geniviextras_only STREQUAL 'yes' -) diff --git a/src/geniviextras/geniviextras.pro b/src/geniviextras/geniviextras.pro deleted file mode 100644 index 8bc10d9..0000000 --- a/src/geniviextras/geniviextras.pro +++ /dev/null @@ -1,36 +0,0 @@ -TARGET = QtGeniviExtras - -QT = core -CONFIG += c++11 - -CONFIG += link_pkgconfig - -build_online_docs: { - QMAKE_DOCS = $$PWD/doc/online/qtgeniviextras.qdocconf -} else { - QMAKE_DOCS = $$PWD/doc/qtgeniviextras.qdocconf -} - -DISTFILES += \ - $$PWD/doc/*.qdocconf \ - $$PWD/doc/online/*.qdocconf \ - $$PWD/doc/src/*.qdoc \ - $$PWD/doc/src/ivigenerator/*.qdoc \ - $$PWD/doc/images/*.jpg \ - $$PWD/doc/images/*.png - -QMAKE_USE += dlt - -CMAKE_MODULE_TESTS = '-' - -HEADERS += \ - qdlt.h \ - qdltregistration.h \ - qdltregistration_p.h \ - qgeniviextrasglobal.h \ - qgeniviextrasglobal_p.h \ - -SOURCES += \ - qdltregistration.cpp \ - -load(qt_module) diff --git a/src/helper/helper.pro b/src/helper/helper.pro deleted file mode 100644 index c530ac8..0000000 --- a/src/helper/helper.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += ivicore ivicore-private -qtConfig(remoteobjects): SUBDIRS += remoteobjects diff --git a/src/helper/remoteobjects/remoteobjects.pro b/src/helper/remoteobjects/remoteobjects.pro deleted file mode 100644 index b56c388..0000000 --- a/src/helper/remoteobjects/remoteobjects.pro +++ /dev/null @@ -1,35 +0,0 @@ -TARGET = QtIviRemoteObjectsHelper -MODULE = iviremoteobjects_helper - -QT = remoteobjects qml ivicore -CONFIG += static internal_module - -CMAKE_MODULE_TESTS = '-' -CONFIG -= create_cmake - -SOURCES += \ - qivipagingmodelqtroadapter.cpp \ - qiviremoteobjectreplicahelper.cpp \ - qiviremoteobjectpendingresult.cpp - -HEADERS += \ - qivipagingmodelqtroadapter.h \ - qiviremoteobjectreplicahelper.h \ - qiviremoteobjectsourcehelper.h \ - qiviremoteobjectpendingresult.h - -REPC_SOURCE += \ - qivipagingmodel.rep - -REPC_REPLICA += \ - qivipagingmodel.rep - -load(qt_module) - -# This is a ugly hack to make sure the generated rep_* headers are installed as well. -# Because the headers are marked as injected headers, syncqt correctly adds them to the headers.pri. -# qmake reads the pri in qt_module.prf and creates the INSTALL targets, but these are only created -# if the files also exist at this point. -targ_headers.CONFIG = no_check_exist - -CONFIG -= hide_symbols diff --git a/src/imports/core/core.pro b/src/imports/core/core.pro deleted file mode 100644 index 9032a4e..0000000 --- a/src/imports/core/core.pro +++ /dev/null @@ -1,21 +0,0 @@ -CXX_MODULE = qml -TARGET = qtivicoreplugin -TARGETPATH = QtIvi -QML_IMPORT_VERSION = 1.0 - -SOURCES += \ - plugin.cpp - -QT = ivicore - -# Automatically update the qmltypes file to keep it up to date with API changes -# This only works for non-prefix builds and not when cross-compiling -!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)):qtHaveModule(quick) { - first.target = first - first.depends += qmltypes - QMAKE_EXTRA_TARGETS += first -} -load(qml_plugin) - -qml_files = $$_PRO_FILE_PWD_/qmldir -OTHER_FILES += $$qml_files diff --git a/src/imports/imports.pro b/src/imports/imports.pro deleted file mode 100644 index 996d662..0000000 --- a/src/imports/imports.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs - -qtHaveModule(ivicore): SUBDIRS += core -qtHaveModule(ivimedia): SUBDIRS += media -qtHaveModule(ivivehiclefunctions): SUBDIRS += vehiclefunctions diff --git a/src/imports/media/media.pro b/src/imports/media/media.pro deleted file mode 100644 index b2cb4be..0000000 --- a/src/imports/media/media.pro +++ /dev/null @@ -1,21 +0,0 @@ -CXX_MODULE = qml -TARGET = qtivimediaplugin -TARGETPATH = QtIvi/Media -QML_IMPORT_VERSION = 1.0 - -SOURCES += \ - plugin.cpp - -QT = ivicore ivimedia - -# Automatically update the qmltypes file to keep it up to date with API changes -# This only works for non-prefix builds and not when cross-compiling -!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)):qtHaveModule(quick) { - first.target = first - first.depends += qmltypes - QMAKE_EXTRA_TARGETS += first -} -load(qml_plugin) - -qml_files = $$_PRO_FILE_PWD_/qmldir -OTHER_FILES += $$qml_files diff --git a/src/imports/vehiclefunctions/vehiclefunctions.pro b/src/imports/vehiclefunctions/vehiclefunctions.pro deleted file mode 100644 index 09c2426..0000000 --- a/src/imports/vehiclefunctions/vehiclefunctions.pro +++ /dev/null @@ -1,32 +0,0 @@ -QT = ivicore ivivehiclefunctions -CONFIG += c++11 - -QT_FOR_CONFIG += ivicore -!qtConfig(ivigenerator): error("No ivigenerator available") - -QFACE_MODULE_NAME = QtIviVehicleFunctions -QFACE_FORMAT = qmlplugin -QFACE_SOURCES = ../../ivivehiclefunctions/ivivehiclefunctions.qface - -QML_IMPORT_VERSION = 1.0 - -load(ivigenerator) - -CXX_MODULE = qml -TARGETPATH = $$replace(URI, \\., /) - -load(qml_plugin) - -# Set the base to null to disable the check that the files are from the source folder -# Because the naming has changed in the last couple of Qt versions, multiple variable -# need to be fixed -!equals(PWD, $$OUT_PWD) { - qmldir.base = - qmlfiles.base = - qmldir.files -= $$_PRO_FILE_PWD_/qmldir - qmlfiles.files -= $$_PRO_FILE_PWD_/qmldir -} -qmldir2build.files -= $$_PRO_FILE_PWD_/qmldir -qmldir2build.files -= $$_PRO_FILE_PWD_/plugins.qmltypes -qml2build.files -= $$_PRO_FILE_PWD_/qmldir -qml2build.files -= $$_PRO_FILE_PWD_/plugins.qmltypes diff --git a/src/ivicore/.prev_configure.cmake b/src/ivicore/.prev_configure.cmake deleted file mode 100644 index 3295315..0000000 --- a/src/ivicore/.prev_configure.cmake +++ /dev/null @@ -1,82 +0,0 @@ - - -#### Inputs - -# input ivigenerator -set(INPUT_ivigenerator "undefined" CACHE STRING "") -set_property(CACHE INPUT_ivigenerator PROPERTY STRINGS undefined no qt system) - -# input qface -set(INPUT_qface "undefined" CACHE STRING "") -set_property(CACHE INPUT_qface PROPERTY STRINGS undefined no qt system) - - - -#### Libraries - - - -#### Tests - - - -#### Features - -qt_feature("python3" PRIVATE - LABEL "python3" - CONDITION tests.python3 OR FIXME -) -qt_feature("python3-virtualenv" PRIVATE - LABEL "virtualenv" - CONDITION QT_FEATURE_python3 AND tests.virtualenv OR FIXME -) -qt_feature("system-qface" PUBLIC - LABEL "System QFace" - CONDITION tests.qface OR FIXME - ENABLE INPUT_qface STREQUAL 'system' - DISABLE INPUT_qface STREQUAL 'no' OR INPUT_qface STREQUAL 'qt' -) -qt_feature("system-ivigenerator" PRIVATE - LABEL "System IVI Generator" - ENABLE INPUT_ivigenerator STREQUAL 'system' - DISABLE ( NOT INPUT_ivigenerator STREQUAL 'system' ) -) -qt_feature("ivigenerator" PUBLIC - LABEL "IVI Generator" - CONDITION QT_FEATURE_ivicore AND QT_FEATURE_python3 AND ( ( QT_FEATURE_python3_virtualenv AND tests.qface-submodule ) OR ( QT_FEATURE_system_qface ) ) OR QT_FEATURE_system_ivigenerator OR FIXME - ENABLE INPUT_ivigenerator STREQUAL 'qt' OR INPUT_ivigenerator STREQUAL 'system' - DISABLE INPUT_ivigenerator STREQUAL 'no' -) -qt_feature("host-tools-only" PRIVATE - LABEL "Only build the host tools" - CONDITION INPUT_host_tools_only STREQUAL 'yes' -) -qt_feature("remoteobjects" PUBLIC - LABEL "QtRemoteObjects Support" - CONDITION TARGET Qt::RemoteObjects OR INPUT_force_ivigenerator_qtremoteobjects STREQUAL 'yes' -) -qt_feature("ivicore" PUBLIC - LABEL "Qt IVI Core" -) -qt_configure_add_summary_section(NAME "Qt IVI Core") -qt_configure_add_summary_section(NAME "Python3") -qt_configure_add_summary_entry(ARGS "python3-virtualenv") -qt_configure_add_summary_entry(ARGS "system-qface") -qt_configure_end_summary_section() # end of "Python3" section -qt_configure_add_summary_entry(ARGS "ivigenerator") -qt_configure_add_summary_entry(ARGS "remoteobjects") -qt_configure_end_summary_section() # end of "Qt IVI Core" section -qt_configure_add_summary_entry( - ARGS "ivicore" - CONDITION NOT QT_FEATURE_ivicore -) -qt_configure_add_report_entry( - TYPE ERROR - MESSAGE "Cannot build the IVI Generator because its dependencies are not satisfied. The IVI Generator provides tooling to generate source code out of IDL files. Make sure python3 and its 'virtualenv' packages are installed. E.g. by running apt-get install python3 python3-virtualenv And make sure the qface submodule is initialized or the correct qface version is installed on your system. E.g. by running the following command: git submodule init && git submodule update" - CONDITION QT_FEATURE_ivicore AND NOT QT_FEATURE_ivigenerator AND ( NOT INPUT_ivigenerator STREQUAL 'no' ) -) -qt_configure_add_report_entry( - TYPE WARNING - MESSAGE "Cannot enable the QtRemoteObjects features because the QtRemoteObjects module is not installed." - CONDITION NOT QT_FEATURE_remoteobjects -) diff --git a/src/ivicore/configure.pri b/src/ivicore/configure.pri deleted file mode 100644 index 6d404f9..0000000 --- a/src/ivicore/configure.pri +++ /dev/null @@ -1,73 +0,0 @@ -QTIVICORE_ROOT = $$PWD - -defineTest(qtConfTest_python3) { - - PYTHON3_PATH = $$(PYTHON3_PATH) - # include binaries installed from homebrew - if(osx|ios): PYTHON3_PATH += /usr/local/bin - PYTHON3_NAMES = "python3" "python" - for (python3_exe_name, PYTHON3_NAMES) { - equals(QMAKE_HOST.os, Windows): python3_exe_name = $${python3_exe_name}.exe - - python3_exe = $$system_path($$qtConfFindInPath($$python3_exe_name, $$PYTHON3_PATH)) - isEmpty(python3_exe): \ - next(); - - qtRunLoggedCommand("$$system_quote($$python3_exe) -c \"import platform; print(platform.python_version_tuple()[0])\"", py_major_version)|next() - equals(py_major_version, 3) { - qtRunLoggedCommand("$$system_quote($$python3_exe) -c \"import platform; print(platform.python_version())\"", python_version)|next() - break() - } - } - - !isEmpty(python3_exe):exists($$python3_exe):!isEmpty(python_version) { - qtLog("Using: $$python3_exe") - qtLog("Version: $$py_major_version") - - $${1}.value = $$python3_exe - export($${1}.value) - $${1}.version = $$python_version - export($${1}.version) - $${1}.cache += value - $${1}.cache += version - export($${1}.cache) - return(true) - } - return(false) -} - -defineTest(qtConfTest_python3_package) { - python3_exe = $$eval($${currentConfig}.tests.python3.value) - package = $$eval($${1}.package) - version = $$eval($${1}.version) - - qtRunLoggedCommand("$$system_quote($$python3_exe) -c \"import pkg_resources; print(pkg_resources.get_distribution('$${package}').version)\"", package_version)|return(false) - !isEmpty(version) { - qtLog("Also checking for the exact version:") - qtLog("Expected: $$version") - !equals(version, $$package_version): return(false) - } - - return(true) -} - -defineTest(qtConfReport_python3) { - !$$eval($${currentConfig}.features.python3.available) { - qtConfReportPadded($${1}Executable, "no") - return() - } - - path = $$eval($${currentConfig}.tests.python3.value) - version = $$eval($${currentConfig}.tests.python3.version) - qtConfReportPadded("$${1}Executable", $$path) - qtConfReportPadded("$${1}Version", $$version) -} - -defineTest(qtConfTest_qface_submodule) { - path = $$QTIVICORE_ROOT/../3rdparty/qface/setup.py - exists($$path): return(true) - - qtLog("The submodule at \"$$path\" is not initialized") - - return(false) -} diff --git a/src/ivicore/ivicore.pro b/src/ivicore/ivicore.pro deleted file mode 100644 index 7f60150..0000000 --- a/src/ivicore/ivicore.pro +++ /dev/null @@ -1,85 +0,0 @@ -TARGET = QtIviCore - -QT = core core-private qml qml-private -CONFIG += c++11 - -build_online_docs: { - QMAKE_DOCS = $$PWD/doc/online/qtivi.qdocconf -} else { - QMAKE_DOCS = $$PWD/doc/qtivi.qdocconf -} - -DISTFILES += \ - $$PWD/doc/*.qdocconf \ - $$PWD/doc/online/*.qdocconf \ - $$PWD/doc/src/*.qdoc \ - $$PWD/doc/src/ivigenerator/*.qdoc \ - $$PWD/doc/images/*.jpg \ - $$PWD/doc/images/*.png - -CMAKE_MODULE_TESTS = '-' -CONFIG -= create_cmake - -MODULE_PLUGIN_TYPES = qtivi - -HEADERS += \ - qiviservicemanager.h \ - qiviserviceinterface.h \ - qiviservicemanager_p.h \ - qiviserviceobject.h \ - qiviabstractfeature.h \ - qiviabstractzonedfeature.h \ - qtiviglobal.h \ - qiviproxyserviceobject.h \ - qiviproxyserviceobject_p.h \ - qivizonedfeatureinterface.h \ - qiviabstractfeature_p.h \ - qiviabstractzonedfeature_p.h \ - qiviqmlconversion_helper.h \ - qiviabstractfeaturelistmodel.h \ - qiviabstractfeaturelistmodel_p.h \ - qtiviglobal_p.h \ - qivipagingmodel.h \ - qivipagingmodel_p.h \ - qivipagingmodelinterface.h \ - qivisearchandbrowsemodel.h \ - qivisearchandbrowsemodel_p.h \ - qivisearchandbrowsemodelinterface.h \ - qivistandarditem.h \ - qivifeatureinterface.h \ - qividefaultpropertyoverrider_p.h \ - qivipendingreply.h \ - qivipendingreply_p.h \ - qivisimulationengine.h \ - qivisimulationproxy.h \ - qtivicoremodule.h \ - qivisimulationglobalobject_p.h - -SOURCES += \ - qiviservicemanager.cpp \ - qiviserviceinterface.cpp \ - qiviserviceobject.cpp \ - qiviabstractfeature.cpp \ - qiviabstractzonedfeature.cpp \ - qiviproxyserviceobject.cpp \ - qivizonedfeatureinterface.cpp \ - qiviabstractfeaturelistmodel.cpp \ - qivipagingmodel.cpp \ - qivipagingmodelinterface.cpp \ - qivisearchandbrowsemodel.cpp \ - qivisearchandbrowsemodelinterface.cpp \ - qivistandarditem.cpp \ - qivifeatureinterface.cpp \ - qividefaultpropertyoverrider.cpp \ - qiviqmlconversion_helper.cpp \ - qivipendingreply.cpp \ - qivisimulationengine.cpp \ - qivisimulationproxy.cpp \ - qtivicoremodule.cpp \ - qivisimulationglobalobject.cpp - -include(queryparser/queryparser.pri) - -load(qt_module) -QMAKE_DOCS_TARGETDIR = qtivi - diff --git a/src/ivicore/queryparser/queryparser.pri b/src/ivicore/queryparser/queryparser.pri deleted file mode 100644 index fed5d70..0000000 --- a/src/ivicore/queryparser/queryparser.pri +++ /dev/null @@ -1,35 +0,0 @@ -QT += core - - -FLEX += $$PWD/qiviqueryparser.l -QLALR += $$PWD/qiviqueryparser.g - -enable-qlalr { - build-pass: message("Using flex and qlalr to generate code") - - flex.output = $$PWD/${QMAKE_FILE_BASE}_flex_p.h - flex.commands = flex -L --nounistd -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME} - flex.dependency_type = TYPE_C - flex.input = FLEX - flex.CONFIG += no_link - QMAKE_EXTRA_COMPILERS += flex - - qlalr.output = $$PWD/${QMAKE_FILE_BASE}_p.h - qlalr.commands = cd $$PWD; $$[QT_INSTALL_BINS]/qlalr --qt --no-debug --no-lines --verbose ${QMAKE_FILE_NAME} - qlalr.dependency_type = TYPE_C - qlalr.input = QLALR - qlalr.CONFIG += no_link - QMAKE_EXTRA_COMPILERS += qlalr -} else { - HEADERS += $$PWD/qiviqueryparser_p.h \ - $$PWD/qiviqueryparser_flex_p.h - OTHER_FILES += $$FLEX - OTHER_FILES += $$QLALR -} - -HEADERS += \ - $$PWD/qiviqueryterm.h \ - $$PWD/qiviqueryterm_p.h - -SOURCES += \ - $$PWD/qiviqueryterm.cpp diff --git a/src/ivicore/queryparser/queryparser.pro b/src/ivicore/queryparser/queryparser.pro deleted file mode 100644 index 5b996ff..0000000 --- a/src/ivicore/queryparser/queryparser.pro +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = queryparser - -include(queryparser.pri) - -SOURCES += \ - main.cpp diff --git a/src/ivimedia/.prev_configure.cmake b/src/ivimedia/.prev_configure.cmake deleted file mode 100644 index 386b00b..0000000 --- a/src/ivimedia/.prev_configure.cmake +++ /dev/null @@ -1,81 +0,0 @@ - - -#### Inputs - -# input taglib -set(INPUT_taglib "undefined" CACHE STRING "") -set_property(CACHE INPUT_taglib PROPERTY STRINGS undefined no qt system) - - - -#### Libraries - -qt_find_package(WrapSystemTagLib PROVIDED_TARGETS WrapSystemTagLib::WrapSystemTagLib MODULE_NAME ivimedia QMAKE_LIB taglib) - - -#### Tests - - - -#### Features - -qt_feature("taglib" PRIVATE - LABEL "taglib" - DISABLE INPUT_taglib STREQUAL 'no' -) -qt_feature_definition("taglib" "QTIVI_NO_TAGLIB" NEGATE) -qt_feature("system-taglib" PRIVATE - LABEL " Using system taglib" - CONDITION QT_FEATURE_taglib AND WrapSystemTagLib_FOUND - ENABLE INPUT_taglib STREQUAL 'system' - DISABLE INPUT_taglib STREQUAL 'qt' -) -qt_feature("media_simulation_backend" PRIVATE - LABEL "Mediaplayer Simulation Backend" - CONDITION TARGET Qt::Multimedia -) -qt_feature("tuner_simulation_backend" PRIVATE - LABEL "Tuner Simulation Backend" - CONDITION TARGET Qt::Multimedia -) -qt_feature("media_qtro_backend" PRIVATE - LABEL "Mediaplayer Qt Remote Objects Backend" - CONDITION QT_FEATURE_remoteobjects AND TARGET Qt::Multimedia -) -qt_feature("media_qtro_simulation_server" PRIVATE - LABEL "Mediaplayer Qt Remote Objects Simulation Server" - CONDITION QT_FEATURE_remoteobjects AND TARGET Qt::Multimedia -) -qt_feature("ivimedia" PUBLIC - LABEL "Qt IVI Media" - CONDITION QT_FEATURE_ivicore -) -qt_configure_add_summary_section(NAME "Qt IVI Media") -qt_configure_add_summary_entry(ARGS "taglib") -qt_configure_add_summary_entry(ARGS "system-taglib") -qt_configure_add_summary_entry(ARGS "media_qtro_simulation_server") -qt_configure_add_summary_section(NAME "Backends") -qt_configure_add_summary_entry(ARGS "media_simulation_backend") -qt_configure_add_summary_entry(ARGS "media_qtro_backend") -qt_configure_add_summary_entry(ARGS "tuner_simulation_backend") -qt_configure_end_summary_section() # end of "Backends" section -qt_configure_end_summary_section() # end of "Qt IVI Media" section -qt_configure_add_summary_entry( - ARGS "ivimedia" - CONDITION NOT QT_FEATURE_ivimedia -) -qt_configure_add_report_entry( - TYPE ERROR - MESSAGE "The taglib submodule was not initialized Please initialize the submodule E.g. by running the following command: git submodule init && git submodule update or disable taglib by passing --taglib=no" - CONDITION NOT tests.taglib_submodule AND QT_FEATURE_taglib AND NOT QT_FEATURE_system_taglib OR FIXME -) -qt_configure_add_report_entry( - TYPE WARNING - MESSAGE "Building taglib was disabled! The Mediaplayer Simulation Backend will only provide a stub and can't scan media files" - CONDITION INPUT_taglib STREQUAL 'no' -) -qt_configure_add_report_entry( - TYPE WARNING - MESSAGE "Building Mediaplayer Simulation Backend was disabled! Please make sure the QtMultimedia module is available." - CONDITION NOT QT_FEATURE_media_simulation_backend AND NOT TARGET Qt::Multimedia -) diff --git a/src/ivimedia/configure.pri b/src/ivimedia/configure.pri deleted file mode 100644 index 6332f3b..0000000 --- a/src/ivimedia/configure.pri +++ /dev/null @@ -1,10 +0,0 @@ -QTIVIMEDIA_ROOT = $$PWD - -defineTest(qtConfTest_taglib_submodule) { - path = $$QTIVIMEDIA_ROOT/../3rdparty/taglib/taglib/INSTALL - exists($$path): return(true) - - qtLog("The submodule at \"$$path\" is not initialized") - - return(false) -} diff --git a/src/ivimedia/ivimedia.pro b/src/ivimedia/ivimedia.pro deleted file mode 100644 index b73912b..0000000 --- a/src/ivimedia/ivimedia.pro +++ /dev/null @@ -1,48 +0,0 @@ -TARGET = QtIviMedia - -QT = core-private ivicore ivicore-private -CONFIG += c++11 - -OTHER_FILES += \ - $$PWD/doc/*.qdocconf \ - $$PWD/doc/src/*.qdoc - -CMAKE_MODULE_TESTS = '-' -CONFIG -= create_cmake - -HEADERS += \ - qtivimediaglobal.h \ - qtivimediaglobal_p.h \ - qivimediaplayer.h \ - qivimediaplayer_p.h \ - qiviplayableitem.h \ - qivimediaplayerbackendinterface.h \ - qiviplayqueue.h \ - qiviplayqueue_p.h \ - qivimediadevicediscoverymodel.h \ - qivimediadevicediscoverymodel_p.h \ - qivimediadevicediscoverymodelbackendinterface.h \ - qivimediadevice.h \ - qivimediaindexercontrol.h \ - qivimediaindexercontrol_p.h \ - qivimediaindexercontrolbackendinterface.h \ - qiviamfmtuner.h \ - qiviamfmtuner_p.h \ - qiviamfmtunerbackendinterface.h \ - qivitunerstation.h - -SOURCES += \ - qivimediaplayer.cpp \ - qiviplayableitem.cpp \ - qivimediaplayerbackendinterface.cpp \ - qiviplayqueue.cpp \ - qivimediadevicediscoverymodel.cpp \ - qivimediadevicediscoverymodelbackendinterface.cpp \ - qivimediadevice.cpp \ - qivimediaindexercontrol.cpp \ - qivimediaindexercontrolbackendinterface.cpp \ - qiviamfmtuner.cpp \ - qiviamfmtunerbackendinterface.cpp \ - qivitunerstation.cpp - -load(qt_module) diff --git a/src/ivivehiclefunctions/doc/snippets/doc_src_ivivehiclefunctions.pro b/src/ivivehiclefunctions/doc/snippets/doc_src_ivivehiclefunctions.pro deleted file mode 100644 index 27fdb8f..0000000 --- a/src/ivivehiclefunctions/doc/snippets/doc_src_ivivehiclefunctions.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [0] -QT += ivivehiclefunctions -#! [0] diff --git a/src/ivivehiclefunctions/ivivehiclefunctions.pro b/src/ivivehiclefunctions/ivivehiclefunctions.pro deleted file mode 100644 index 010332f..0000000 --- a/src/ivivehiclefunctions/ivivehiclefunctions.pro +++ /dev/null @@ -1,23 +0,0 @@ -TARGET = QtIviVehicleFunctions -QT = core core-private ivicore ivicore-private -CONFIG += c++11 ivigenerator - -QT_FOR_CONFIG += ivicore -!qtConfig(ivigenerator): error("No ivigenerator available") - -OTHER_FILES = \ - $$PWD/doc/*.qdocconf \ - $$PWD/doc/src/*.qdoc \ - $$PWD/doc/snippets/* \ - $$PWD/doc/images/* - -CMAKE_MODULE_TESTS = '-' -CONFIG -= create_cmake - -QFACE_MODULE_NAME = QtIviVehicleFunctions -QFACE_SOURCES += ivivehiclefunctions.qface - -# Autogenerated modules rely on syncqt to be run to generate forward headers. When building from a -# tarball syncqt is not run as part of the build, setting git_build enforces running syncqt. -CONFIG += git_build -load(ivigenerator_qt_module) diff --git a/src/plugins/ivimedia/ivimedia.pro b/src/plugins/ivimedia/ivimedia.pro deleted file mode 100644 index 99d46b5..0000000 --- a/src/plugins/ivimedia/ivimedia.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs - -QT_FOR_CONFIG += ivimedia-private - -qtConfig(tuner_simulation_backend): SUBDIRS += tuner_simulator -qtConfig(media_simulation_backend): SUBDIRS += media_simulator -qtConfig(media_qtro_backend): SUBDIRS += media_qtro - -OTHER_FILES += \ - $$PWD/doc/*.qdocconf \ - $$PWD/doc/src/*.qdoc diff --git a/src/plugins/ivimedia/media_qtro/media_qtro.pro b/src/plugins/ivimedia/media_qtro/media_qtro.pro deleted file mode 100644 index f409278..0000000 --- a/src/plugins/ivimedia/media_qtro/media_qtro.pro +++ /dev/null @@ -1,34 +0,0 @@ -TARGET = media_qtro - -PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = ivimedia -PLUGIN_CLASS_NAME = MediaQtROPlugin - -load(qt_plugin) - -DISTFILES += media_qtro.json - -QT = ivicore ivimedia remoteobjects iviremoteobjects_helper_private - -HEADERS += \ - mediaplugin.h \ - mediaplayerbackend.h \ - mediaindexerbackend.h \ - searchandbrowsemodel.h \ - mediadiscoverybackend.h \ - usbdevice.h - -SOURCES += \ - mediaplugin.cpp \ - mediaplayerbackend.cpp \ - mediaindexerbackend.cpp \ - searchandbrowsemodel.cpp \ - mediadiscoverybackend.cpp \ - usbdevice.cpp - -REPC_REPLICA += \ - $$PWD/../../../tools/media-simulation-server/qivimediaindexer.rep \ - $$PWD/../../../tools/media-simulation-server/qivimediaplayer.rep \ - $$PWD/../../../tools/media-simulation-server/qivisearchandbrowsemodel.rep \ - $$PWD/../../../tools/media-simulation-server/qivimediadiscoverymodel.rep \ - diff --git a/src/plugins/ivimedia/media_simulator/.prev_CMakeLists.txt b/src/plugins/ivimedia/media_simulator/.prev_CMakeLists.txt deleted file mode 100644 index c6287ae..0000000 --- a/src/plugins/ivimedia/media_simulator/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from media_simulator.pro. - -##################################################################### -## MediaPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(MediaPlugin - OUTPUT_NAME media_simulator - TYPE qtivi - SOURCES - database_helper.h - logging.cpp logging.h - mediadiscoverybackend.cpp mediadiscoverybackend.h - mediaindexerbackend.cpp mediaindexerbackend.h - mediaplayerbackend.cpp mediaplayerbackend.h - mediaplugin.cpp mediaplugin.h - searchandbrowsebackend.cpp searchandbrowsebackend.h - usbbrowsebackend.cpp usbbrowsebackend.h - usbdevice.cpp usbdevice.h - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_LIBRARIES - Qt::Core - Qt::IviCore - Qt::IviMedia - Qt::Multimedia - Qt::Sql - WrapTagLib::WrapTagLib -) - -#### Keys ignored in scope 1:.:.:media_simulator.pro:<TRUE>: -# DISTFILES = "media_simulator.json" -# PLUGIN_EXTENDS = "ivimedia" diff --git a/src/plugins/ivimedia/media_simulator/media_simulator.pri b/src/plugins/ivimedia/media_simulator/media_simulator.pri deleted file mode 100644 index d4d2f15..0000000 --- a/src/plugins/ivimedia/media_simulator/media_simulator.pri +++ /dev/null @@ -1,29 +0,0 @@ -QT_FOR_CONFIG += ivimedia-private -QT = core ivicore ivimedia sql multimedia - -INCLUDEPATH += $$PWD - -qtConfig(system-taglib) { - QMAKE_USE += taglib -} else:qtConfig(taglib) { - include($$PWD/../../../3rdparty/taglib/taglib.pri) -} - -HEADERS += \ - $$PWD/mediaplayerbackend.h \ - $$PWD/searchandbrowsebackend.h \ - $$PWD/mediadiscoverybackend.h \ - $$PWD/usbdevice.h \ - $$PWD/usbbrowsebackend.h \ - $$PWD/mediaindexerbackend.h \ - $$PWD/logging.h \ - $$PWD/database_helper.h - -SOURCES += \ - $$PWD/mediaplayerbackend.cpp \ - $$PWD/searchandbrowsebackend.cpp \ - $$PWD/mediadiscoverybackend.cpp \ - $$PWD/usbdevice.cpp \ - $$PWD/usbbrowsebackend.cpp \ - $$PWD/mediaindexerbackend.cpp \ - $$PWD/logging.cpp diff --git a/src/plugins/ivimedia/media_simulator/media_simulator.pro b/src/plugins/ivimedia/media_simulator/media_simulator.pro deleted file mode 100644 index 27084f4..0000000 --- a/src/plugins/ivimedia/media_simulator/media_simulator.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = media_simulator - -include(media_simulator.pri) - -PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = ivimedia -PLUGIN_CLASS_NAME = MediaPlugin - -load(qt_plugin) - -DISTFILES += media_simulator.json - -HEADERS += \ - mediaplugin.h \ - -SOURCES += \ - mediaplugin.cpp \ diff --git a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro b/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro deleted file mode 100644 index c9810f3..0000000 --- a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro +++ /dev/null @@ -1,21 +0,0 @@ -TARGET = tuner_simulator - -PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = ivimedia -PLUGIN_CLASS_NAME = TunerPlugin - -QT = core ivicore ivimedia - -load(qt_plugin) - -DISTFILES += tuner_simulator.json - -HEADERS += \ - amfmtunerbackend.h \ - searchandbrowsebackend.h \ - tunerplugin.h - -SOURCES += \ - amfmtunerbackend.cpp \ - searchandbrowsebackend.cpp \ - tunerplugin.cpp diff --git a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro deleted file mode 100644 index 6b14506..0000000 --- a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs - -QT_FOR_CONFIG += ivivehiclefunctions-private - -qtConfig(vehiclefunctions_simulation_backend): SUBDIRS += vehiclefunctions_simulator -qtConfig(vehiclefunctions_qtro_backend): SUBDIRS += vehiclefunctions_qtro - -OTHER_FILES += \ - $$PWD/doc/*.qdocconf \ - $$PWD/doc/src/*.qdoc diff --git a/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro b/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro deleted file mode 100644 index 016900c..0000000 --- a/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = vehiclefunction_qtro - -QT = core ivicore ivivehiclefunctions -CONFIG += c++11 ivigenerator - -CMAKE_MODULE_TESTS = '-' - -QFACE_FORMAT = backend_qtro -QFACE_MODULE_NAME = QtIviVehicleFunctions -QFACE_SOURCES += ../../../ivivehiclefunctions/ivivehiclefunctions.qface - -PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = ivivehiclefunctions -PLUGIN_CLASS_NAME = QtIviVehicleFunctionsQtROPlugin - -load(qt_plugin) diff --git a/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro deleted file mode 100644 index 8751c91..0000000 --- a/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro +++ /dev/null @@ -1,21 +0,0 @@ -TARGET = vehiclefunction_simulator - -QT = core ivicore ivivehiclefunctions -CONFIG += c++11 ivigenerator - -CMAKE_MODULE_TESTS = '-' - -QFACE_FORMAT = backend_simulator -QFACE_MODULE_NAME = QtIviVehicleFunctions -QFACE_SOURCES += ../../../ivivehiclefunctions/ivivehiclefunctions.qface - -PLUGIN_TYPE = qtivi -PLUGIN_EXTENDS = ivivehiclefunctions -PLUGIN_CLASS_NAME = QtIviVehicleFunctionsSimulatorPlugin - -load(qt_plugin) - -RESOURCES += \ - qml.qrc - -QML_IMPORT_PATH = $$OUT_PWD/qml diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index af84b4b..0000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -qtHaveModule(ivimedia): SUBDIRS += ivimedia -qtHaveModule(ivivehiclefunctions): SUBDIRS += ivivehiclefunctions diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 58f2607..0000000 --- a/src/src.pro +++ /dev/null @@ -1,70 +0,0 @@ -TEMPLATE = subdirs - -# Include the config.pri from the build folder as the qtgenivieextras-config.pri is copied -# while syncqt is running for the module and this is not done yet. -include($$OUT_PWD/geniviextras/qtgeniviextras-config.pri) -include($$OUT_PWD/ivicore/qtivicore-config.pri) -include($$OUT_PWD/ivivehiclefunctions/qtivivehiclefunctions-config.pri) -include($$OUT_PWD/ivimedia/qtivimedia-config.pri) -QT_FOR_CONFIG += geniviextras geniviextras-private \ - ivicore ivicore-private \ - ivivehiclefunctions ivivehiclefunctions-private \ - ivimedia ivimedia-private - -!qtConfig(host-tools-only) { - !qtConfig(geniviextras-only):qtConfig(ivicore) { - SUBDIRS += ivicore \ - helper - imports.depends += ivicore - helper.depends += ivicore - - qtConfig(ivigenerator): qtConfig(ivivehiclefunctions): { - SUBDIRS += ivivehiclefunctions - ivivehiclefunctions.depends = ivicore helper - !qtConfig(system-ivigenerator): ivivehiclefunctions.depends += sub-ivigenerator - plugins.depends += ivivehiclefunctions - imports.depends += ivivehiclefunctions - } - - qtConfig(ivimedia) { - SUBDIRS += ivimedia - ivimedia.depends = ivicore helper - plugins.depends += ivimedia - imports.depends += ivimedia - } - - qtConfig(remoteobjects):!android: { - - qtConfig(vehiclefunctions_qtro_simulation_server) { - src_tools_vehiclefunctions-simulation-server.subdir = tools/vehiclefunctions-simulation-server - !qtConfig(system-ivigenerator): src_tools_vehiclefunctions-simulation-server.depends += sub-ivigenerator - src_tools_vehiclefunctions-simulation-server.depends += ivicore helper ivivehiclefunctions - src_tools_vehiclefunctions-simulation-server.target = sub-vehiclefunctions-simulation-server - SUBDIRS += src_tools_vehiclefunctions-simulation-server - } - - qtConfig(media_qtro_simulation_server) { - src_tools_media-simulation-server.subdir = tools/media-simulation-server - src_tools_media-simulation-server.depends += ivicore helper ivimedia - src_tools_media-simulation-server.target = sub-media-simulation-server - SUBDIRS += src_tools_media-simulation-server - } - } - } - - qtConfig(geniviextras): SUBDIRS += geniviextras -} - -!qtConfig(geniviextras-only) { - qtConfig(ivicore): qtConfig(ivigenerator) { - !qtConfig(system-ivigenerator) { - src_tools_ivigenerator.subdir = tools/ivigenerator - src_tools_ivigenerator.target = sub-ivigenerator - SUBDIRS += src_tools_ivigenerator - } - } -} - -SUBDIRS = plugins \ - imports - diff --git a/src/tools/ivigenerator/ivigenerator.pri b/src/tools/ivigenerator/ivigenerator.pri deleted file mode 100644 index 0e11202..0000000 --- a/src/tools/ivigenerator/ivigenerator.pri +++ /dev/null @@ -1,5 +0,0 @@ -# TODO: Turn this into a proper target so we can build it? -QFACE_SOURCES = $$PWD/example/com.pelagicore.ivi.climate.qface -QFACE_MODULE_NAME = "climate" - -include(ivigenerator.prf) diff --git a/src/tools/ivigenerator/ivigenerator.pro b/src/tools/ivigenerator/ivigenerator.pro deleted file mode 100644 index 6a3ec0d..0000000 --- a/src/tools/ivigenerator/ivigenerator.pro +++ /dev/null @@ -1,175 +0,0 @@ -TEMPLATE = aux - -# We need the include here as we don't have a hard build dependency against ivicore, but we still -# need to have the config, so we just include that, even if ivicore itself is not build. -include($$OUT_PWD/../../ivicore/qtivicore-config.pri) -QT_FOR_CONFIG += ivicore - -!qtConfig(system-qface): include(qface_internal_build.pri) - -# Make sure to only build this once in a debug_and_release config -# This needs to be the last step as it unsets other configs and may have side effects -CONFIG -= debug_and_release - -common.files += \ - templates/common/generated_comment.cpp.tpl \ - templates/common/qtivi_macros.j2 \ - templates/common/simulation.qmltypes.tpl \ - templates/common/plugins.qmltypes.tpl \ - templates/common/designer.metainfo.tpl \ - templates/common/qmldir.tpl \ - templates/common/interface.rep.tpl \ - templates/common/simulation_data.json.tpl \ - templates/common/simulation.qrc.tpl \ - templates/common/module_simulation.qml.tpl \ - templates/common/backend_simulation.cpp.tpl \ - templates/common/backend_simulation.h.tpl \ - templates/common/backend_simulation.qml.tpl \ - templates/common/pagingmodel_simulation.h.tpl \ - templates/common/pagingmodel_simulation.cpp.tpl -common.path = $$[QT_HOST_BINS]/ivigenerator/templates/common - -templates_frontend.files += \ - templates/frontend/backendinterface.cpp.tpl \ - templates/frontend/backendinterface.h.tpl \ - templates/frontend/global.h.tpl \ - templates/frontend/interface.cpp.tpl \ - templates/frontend/interface.h.tpl \ - templates/frontend/interface_p.h.tpl \ - templates/frontend/module.cpp.tpl \ - templates/frontend/module.h.tpl \ - templates/frontend/module_qml_enum.qdocinc.tpl \ - templates/frontend/module.pri.tpl \ - templates/frontend/modulefactory.cpp.tpl \ - templates/frontend/modulefactory.h.tpl \ - templates/frontend/struct.cpp.tpl \ - templates/frontend/struct.h.tpl -templates_frontend.path = $$[QT_HOST_BINS]/ivigenerator/templates/frontend - -templates_qmlplugin.files += \ - templates/qmlplugin/module.pri.tpl \ - templates/qmlplugin/plugin.cpp.tpl \ - templates/qmlplugin/qmldir_plugin.tpl -templates_qmlplugin.path = $$[QT_HOST_BINS]/ivigenerator/templates/qmlplugin - -templates_backend_simulator.files += \ - templates/backend_simulator/plugin.cpp.tpl \ - templates/backend_simulator/plugin.h.tpl \ - templates/backend_simulator/plugin.json \ - templates/backend_simulator/plugin.pri.tpl \ - templates/backend_simulator/plugin.pro -templates_backend_simulator.path = $$[QT_HOST_BINS]/ivigenerator/templates/backend_simulator - -templates_backend_qtro.files += \ - templates/backend_qtro/backend.cpp.tpl \ - templates/backend_qtro/backend.h.tpl \ - templates/backend_qtro/pagingmodel.h.tpl \ - templates/backend_qtro/pagingmodel.cpp.tpl \ - templates/backend_qtro/plugin.cpp.tpl \ - templates/backend_qtro/plugin.h.tpl \ - templates/backend_qtro/plugin.json \ - templates/backend_qtro/plugin.pri.tpl -templates_backend_qtro.path = $$[QT_HOST_BINS]/ivigenerator/templates/backend_qtro - -templates_server_qtro.files += \ - templates/server_qtro/core.cpp.tpl \ - templates/server_qtro/core.h.tpl \ - templates/server_qtro/server.pri.tpl -templates_server_qtro.path = $$[QT_HOST_BINS]/ivigenerator/templates/server_qtro - -templates_server_qtro_simulator.files += \ - templates/server_qtro_simulator/core.cpp.tpl \ - templates/server_qtro_simulator/core.h.tpl \ - templates/server_qtro_simulator/adapter.cpp.tpl \ - templates/server_qtro_simulator/adapter.h.tpl \ - templates/server_qtro_simulator/main.cpp.tpl \ - templates/server_qtro_simulator/server.pri.tpl -templates_server_qtro_simulator.path = $$[QT_HOST_BINS]/ivigenerator/templates/server_qtro_simulator - -templates_test.files += \ - templates/test/tst_test.h.tpl \ - templates/test/tst_test.cpp.tpl \ - templates/test/module.pri.tpl \ - templates/test/main.cpp.tpl \ - templates/test/pagingmodel.h.tpl -templates_test.path = $$[QT_HOST_BINS]/ivigenerator/templates/test - -templates_yaml.files += \ - templates/frontend.yaml \ - templates/qmlplugin.yaml \ - templates/backend_simulator.yaml \ - templates/test.yaml -templates_yaml.path = $$[QT_HOST_BINS]/ivigenerator/templates - -generator_module.files += \ - generator/global_functions.py \ - generator/builtin_config.py \ - generator/filters.py \ - generator/rule_generator.py -generator_module.path = $$[QT_HOST_BINS]/ivigenerator/generator - -generator.files += \ - generate.py \ - $$OUT_PWD/.config -generator.path = $$[QT_HOST_BINS]/ivigenerator - -qtConfig(remoteobjects) { - templates_yaml.files += templates/backend_qtro.yaml \ - templates/server_qtro.yaml \ - templates/server_qtro_simulator.yaml \ - - INSTALLS += templates_backend_qtro \ - templates_server_qtro \ - templates_server_qtro_simulator \ - -} - -INSTALLS += generator \ - generator_module \ - templates_yaml \ - common \ - templates_frontend \ - templates_qmlplugin \ - templates_backend_simulator \ - templates_test \ - -OTHER_FILES += deploy-virtualenv.bat \ - deploy-virtualenv.sh \ - deploy-virtualenv-files.txt \ - -# Ensure files are installed to qtbase for non-prefixed builds -!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { - for (install_target, INSTALLS) { - path = $$eval($${install_target}.path) - depends = $$eval($${install_target}.depends) - $${install_target}_copy.input = $${install_target}.files - $${install_target}_copy.output = $$path/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - !isEmpty(depends) { - $${install_target}_copy.depends = $$eval($${depends}.target) - } - $${install_target}_copy.commands = $$sprintf($$QMAKE_MKDIR_CMD, "$$path") $$escape_expand(\n\t) - contains($${install_target}.CONFIG, directory): $${install_target}_copy.commands += $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - else: $${install_target}_copy.commands += $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - $${install_target}_copy.name = COPY ${QMAKE_FILE_IN} - $${install_target}_copy.CONFIG = no_link target_predeps no_clean - QMAKE_EXTRA_COMPILERS += $${install_target}_copy - } -} - -defineTest(createConfig) { - write_file($$OUT_PWD/.config, $$list("---")) - for(var, ARGS) { - isEmpty($$var):out = "$$var: ~" - else:count($$var, 1):out = "$$var: \"$$first($$var)\"" - else { - out = "$$var:" - for(val, $$var):out += " - \"$$val\"" - out=$$join(out, "$$escape_expand(\\n)") - } - write_file($$OUT_PWD/.config, out, append) - } -} - -VERSION = $$MODULE_VERSION -FEATURES = $${QT.ivicore.enabled_features} -createConfig(VERSION, FEATURES) diff --git a/src/tools/ivigenerator/qface_internal_build.pri b/src/tools/ivigenerator/qface_internal_build.pri deleted file mode 100644 index 8bfc183..0000000 --- a/src/tools/ivigenerator/qface_internal_build.pri +++ /dev/null @@ -1,107 +0,0 @@ -QFACE_SOURCE_DIR = $$QTIVI_ROOT/src/3rdparty/qface - -# only create the environment once -debug_and_release:build_pass:CONFIG(release, debug|release) { - return(); -} - -!exists($$QFACE_SOURCE_DIR/setup.py): error("Couldn't find $$QFACE_SOURCE_DIR: Please make sure all submodules are initialized") - -include($$shadowed($$PWD/../../ivicore/qtivicore-config.pri)) - -VIRTUALENV_EXE = $$system_quote($$QMAKE_PYTHON3_LOCATION) -m virtualenv -# virtualenv is always using the default interpreter, which is python2 on many systems" -# by adding -p we enforce that the python3 interpreter is used and make sure python3 is installed in the virtualenv -VIRTUALENV_EXE += " -p $$system_quote($$QMAKE_PYTHON3_LOCATION)" - -RELOCATE_VIRTUALENV = $$system_path($$QTIVI_ROOT/src/3rdparty/virtualenv/relocate_virtualenv.py) - -# Use a Python virtualenv for installing qface, so we don't pollute the user environment -# On some systems virtualenv --always-copy doesn't work (https://github.com/pypa/virtualenv/issues/565). -# To workaround the problem, we need to manually create the folder and create the virtualenv from -# inside -equals(QMAKE_HOST.os, Windows): qtivi_qface_virtualenv.target = qtivi_qface_virtualenv/Scripts/python.exe -else: qtivi_qface_virtualenv.target = qtivi_qface_virtualenv/bin/python -qtivi_qface_virtualenv.commands = \ - $(MKDIR) qtivi_qface_virtualenv $$escape_expand(\n\t) \ - cd qtivi_qface_virtualenv && $$VIRTUALENV_EXE --always-copy . $$escape_expand(\n\t) \ - cd qtivi_qface_virtualenv && $$system_quote($$QMAKE_PYTHON3_LOCATION) $$RELOCATE_VIRTUALENV . $$escape_expand(\n\t) \ - @echo "Set up virtualenv for qface, name: qtivi_qface_virtualenv" -QMAKE_EXTRA_TARGETS += qtivi_qface_virtualenv - -# This helper adds a target for the qtivi_qface_virtualenv folder -# This target is needed for any target which has the folder as a dependency but not the python executable -qtivi_qface_virtualenv_helper.target = qtivi_qface_virtualenv -qtivi_qface_virtualenv_helper.depends = $${qtivi_qface_virtualenv.target} -QMAKE_EXTRA_TARGETS += qtivi_qface_virtualenv_helper - -equals(QMAKE_HOST.os, Windows): VIRTUALENV_ACTIVATION = qtivi_qface_virtualenv\Scripts\activate && -else: VIRTUALENV_ACTIVATION = . qtivi_qface_virtualenv/bin/activate && - -# Create the forceRebuild file during the qmake run. -# This file is used as a dependency in other Makefiles. -# Once the virtualenv is created and setup the file will -# be touched to recreate theses Makefiles. -write_file($$OUT_PWD/forceRebuild) - -PYTHON3_SHORT_VERSION_SPLITTED = $$split(QMAKE_PYTHON3_VERSION, .) -PYTHON3_SHORT_VERSION = $$member(PYTHON3_SHORT_VERSION_SPLITTED, 0).$$member(PYTHON3_SHORT_VERSION_SPLITTED, 1) - -# On the CI we use the special wheel folder when available to not download all packages again on each build -PYTHON3_WHEEL_CACHE=$$(PYTHON3_WHEEL_CACHE) -!isEmpty(PYTHON3_WHEEL_CACHE): PIP3_INSTALL_COMMAND = pip3 install --no-index --find-links=$$system_path($$PYTHON3_WHEEL_CACHE) $$system_path($$QFACE_SOURCE_DIR) --verbose -else: PIP3_INSTALL_COMMAND = pip3 install --upgrade $$system_path($$QFACE_SOURCE_DIR) - -# Always run this target -equals(QMAKE_HOST.os, Windows): qtivi_qface_install.target = qtivi_qface_virtualenv/Lib/site-packages/qface -else: qtivi_qface_install.target = qtivi_qface_virtualenv/lib/python$${PYTHON3_SHORT_VERSION}/site-packages/qface -qtivi_qface_install.depends = $${qtivi_qface_virtualenv.target} -qtivi_qface_install.depends += $$QFACE_SOURCE_DIR/setup.py -qtivi_qface_install.depends += $$QFACE_SOURCE_DIR/requirements.txt -qtivi_qface_install.depends += $$QFACE_SOURCE_DIR/qface/__about__.py -qtivi_qface_install.commands = $$VIRTUALENV_ACTIVATION \ - $$PIP3_INSTALL_COMMAND $$escape_expand(\n\t) \ - @echo "Installed qface development version into qtivi_qface_virtualenv" $$escape_expand(\n\t) -equals(QMAKE_HOST.os, Windows): qtivi_qface_install.commands += @COPY /B $$system_path($$OUT_PWD/forceRebuild)+,, $$system_path($$OUT_PWD/forceRebuild) >NUL -else: qtivi_qface_install.commands += @touch $$OUT_PWD/forceRebuild -QMAKE_EXTRA_TARGETS += qtivi_qface_install - -# We need to make the virtualenv first deployable -# Otherwise it still needs some modules from the system -deploy_virtualenv.target = .stamp-deploy_virtualenv -equals(QMAKE_HOST.os, Windows) { - deploy_virtualenv.commands = $$system_path($$PWD/deploy-virtualenv.bat) qtivi_qface_virtualenv $$escape_expand(\n\t) - deploy_virtualenv.commands += @type nul > $$system_path($$OUT_PWD/.stamp-deploy_virtualenv) -} else { - deploy_virtualenv.commands = $$PWD/deploy-virtualenv.sh qtivi_qface_virtualenv $$escape_expand(\n\t) - deploy_virtualenv.commands += @touch $$OUT_PWD/.stamp-deploy_virtualenv -} -deploy_virtualenv.depends = $${qtivi_qface_install.target} -QMAKE_EXTRA_TARGETS += deploy_virtualenv -PRE_TARGETDEPS += $${deploy_virtualenv.target} - -virtualenv.files = $$OUT_PWD/qtivi_qface_virtualenv -virtualenv.path = $$[QT_HOST_BINS]/ivigenerator -virtualenv.depends = deploy_virtualenv -virtualenv.CONFIG = no_check_exist directory no_build - -INSTALLS += virtualenv - -# On osx the hidden .Python file is needed in the installed virtualenv as well -# this file is not installed by the directory config, so we need to install it manually -equals(QMAKE_HOST.os, Darwin) { - virtualenv-python.files = $$OUT_PWD/qtivi_qface_virtualenv/.Python - virtualenv-python.path = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv - # In case the file doesn't exist, touch creates it and fixes the install target - virtualenv-python.extra = @touch $$OUT_PWD/qtivi_qface_virtualenv/.Python - virtualenv-python.CONFIG = no_check_exist - virtualenv-python.depends = install_virtualenv - INSTALLS += virtualenv-python -} - -# Create the ivigenerator when the prepare_docs target is run, to generate the code -# and have it ready when qdoc parses it for the documentation -prepare_docs { - prepare_docs.depends += $${deploy_virtualenv.target} - QMAKE_EXTRA_TARGETS += prepare_docs -} diff --git a/src/tools/media-simulation-server/media-simulation-server.pro b/src/tools/media-simulation-server/media-simulation-server.pro deleted file mode 100644 index a8ac1fa..0000000 --- a/src/tools/media-simulation-server/media-simulation-server.pro +++ /dev/null @@ -1,31 +0,0 @@ -TARGET = ivimedia-simulation-server -TEMPLATE = app - -include($$PWD/../../plugins/ivimedia/media_simulator/media_simulator.pri) - -QT += remoteobjects iviremoteobjects_helper_private -CONFIG += c++11 - -load(qt_tool) - - -HEADERS += \ - core.h \ - qivimediaindexerqtroadapter.h \ - qivimediaplayerqtroadapter.h \ - qivimediadiscoveryqtroadapter.h \ - qivisearchandbrowsemodelqtroadapter.h - -SOURCES += \ - main.cpp \ - core.cpp \ - qivimediaindexerqtroadapter.cpp \ - qivimediaplayerqtroadapter.cpp \ - qivimediadiscoveryqtroadapter.cpp \ - qivisearchandbrowsemodelqtroadapter.cpp - -REPC_SOURCE += \ - $$PWD/qivimediaindexer.rep \ - $$PWD/qivimediaplayer.rep \ - $$PWD/qivimediadiscoverymodel.rep \ - $$PWD/qivisearchandbrowsemodel.rep \ diff --git a/src/tools/vehiclefunctions-simulation-server/vehiclefunctions-simulation-server.pro b/src/tools/vehiclefunctions-simulation-server/vehiclefunctions-simulation-server.pro deleted file mode 100644 index 2443871..0000000 --- a/src/tools/vehiclefunctions-simulation-server/vehiclefunctions-simulation-server.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = ivivehiclefunctions-simulation-server -TEMPLATE = app -QT = core ivicore ivivehiclefunctions -QT -= gui -CONFIG += c++11 ivigenerator - -QT_FOR_CONFIG += ivicore -!qtConfig(ivigenerator): error("No ivigenerator available") - -load(qt_tool) - -QFACE_FORMAT = server_qtro_simulator -QFACE_MODULE_NAME = QtIviVehicleFunctions -QFACE_SOURCES += ../../ivivehiclefunctions/ivivehiclefunctions.qface - -RESOURCES += ../../plugins/ivivehiclefunctions/vehiclefunctions_simulator/qml.qrc - -QML_IMPORT_PATH = $$OUT_PWD/qml |