summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Move qtivi over to the new config systemDominik Holland2017-02-0134-30/+351
| | | | | | | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. The geniviextras-only CONFIG option has now been replaced with a command-line option and can be used by passing it to qmake after '--'. E.g. 'qmake -- --geniviextras-only'. Removed adding DLT into the rpath. Similar to all other Qt modules, it is now expected that packages found using pkg-config can be found by the dynamic linker. Change-Id: If46cd1b79413cd7571ee1068898848d9871e61ba Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Doc: Fix broken link to QmlLive docsVenugopal Shivashankar2017-01-271-1/+1
| | | | | Change-Id: Ie4fd4f0503b5d828a5a04a744e796d30f229aeae Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* Documentation fixesDominik Holland2017-01-262-1/+2
| | | | | | | | | | The QIviMedia modules documentation was only included in the offline documentation. Also show the correct version in the docs Change-Id: I0dc396dd9599122821c79c9391272a9b8608d5df Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Merge remote-tracking branch 'origin/5.7' into 5.8Dominik Holland2017-01-267-14/+63
|\ | | | | | | Change-Id: I8af522cf3a243e307576b038f18372facd8caac9
| * Use more plausible value attributes in vehiclefunction_simulator backend.5.7Andreas Hartmetz2017-01-261-8/+8
| | | | | | | | | | | | | | | | | | | | | | The targetTemperature range was just wrong (the right range is debatable, I've just taken it from neptune-ui), the fanSpeedLevel range is now also the same as in neptune-ui, which is less important. Change-Id: I623eb22187ac831bbd0afc3798267fb6dfc54670 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Andreas Hartmetz <andreas.hartmetz@kdab.com>
| * The steering wheel heater is available in the vehiclefunction_simulator ↵Andreas Hartmetz2016-12-071-1/+1
| | | | | | | | | | | | | | backend - expose that Change-Id: I32382534ab82dfa506ea7f435691c621890009cd Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * Doc: Reword the section about "Prerequisites"Venugopal Shivashankar2016-12-011-5/+5
| | | | | | | | | | | | | | | | | | The earlier version said that the prerequisites are listed below, which was not the case. Task-number: QTAUTO-207 Change-Id: Ic1890290b6b07e73d20d7ee3446e9e9bca1716c9 Reviewed-by: Alistair Adams <alistair.adams@qt.io>
| * Doc: Update Qt Automotive suite install instructionsVenugopal Shivashankar2016-11-294-4/+49
| | | | | | | | | | | | | | | | | | Task-number: QTAUTO-207 Change-Id: I870f2b0a0d8b53628731460575ddaf0ac629d629 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Alistair Adams <alistair.adams@qt.io>
| * Fixed problems when resolving the libdlt dependencyDominik Holland2016-11-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The automotive-dlt pkg-config files points to the include folder of dlt so we don't need the dlt prefix when including the headers. As dlt is installed into /usr, this wasn't a problem as it still worked. But if dlt is build manually it installs itself to /usr/local and the paths are not correct in this case. When picking up libdlt we also need to make sure that the path we resolved using pkg-config is added as a rpath and this is part of the prl file created for QtGeniviExtras, as the custom rpath is also needed for the application/lib using QtGeniviExtras, as it would have a unresolved runtime dependency otherwise Change-Id: I3f2a78482573e6802371e29392de5a4a49b5c379 Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | ivimedia: support setting an invalid QVariant as currentTrackDominik Holland2017-01-121-3/+7
| | | | | | | | | | | | | | | | This is needed from the backend to tell that there is no current track Change-Id: I499f453a9414fcdcd2700e62dda1192246d30be8 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | media_simulator: Emit currentIndexChanged on insert/remove/moveDominik Holland2017-01-121-1/+54
| | | | | | | | | | Change-Id: Ieb26460afa2bec79d5b49f39d1a9709e0bdcb08f Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
* | Make the currentIndex property of QIviPlayQueue writableDominik Holland2017-01-124-2/+16
| | | | | | | | | | Change-Id: I87b3fbb880fac8008d387bb6d0e0e5c89b331402 Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
* | Improved the media_simulator backendDominik Holland2017-01-122-4/+53
| | | | | | | | | | | | | | | | It now supports the playback of media-files and navigating through the playqueue using previous and next Change-Id: I2b382b94fd1d36f5fbbb8b3108bf43aa218b54b8 Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
* | Fixed bug in QIviMediaPlayer::onCurrentTrackChangedDominik Holland2017-01-111-1/+1
| | | | | | | | | | | | | | | | Instead of using the passed value, we tried to convert the old (invalid) data which always failed Change-Id: I94b1c02f6090417fa013b32796b9f71eb1adafc0 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Add a geniviextras-only config option to only build qtgeniviextrasDominik Holland2017-01-091-10/+12
| | | | | | | | | | Change-Id: I60c57ea414bc835c3996fc36e6c42119589bc5be Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Refactored the qdltregistrationDominik Holland2016-12-162-47/+67
| | | | | | | | | | | | | | | | The new code is less error prone and fully supports the lazy initialization of DLT Application and DLT contexts. Change-Id: I37165c0e6a02b9e8b54eb8c472b2c3b7baf0f4d9 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Sort includes in media plugin by alphabetOleksandr Kravchuk2016-12-0711-27/+38
| | | | | | | | | | | | | | | | Sorted includes in media simulator plugin by alphabet. Change-Id: I7444d57a0dcc14ed2fa585d2bb76b252a41d93e8 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* | Extract album cover art from ID3v2 tagsOleksandr Kravchuk2016-12-073-6/+37
| | | | | | | | | | | | | | | | Added cover art extraction from ID3 tags. Images are saved on filesystem and their pathes are set as a value of the coverArtUrl audio track's property. Change-Id: I1cea97e452081bb064631aa9756361599d426be4 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* | Make it possible to change the DLT appID and description once registeredDominik Holland2016-11-291-3/+29
| | | | | | | | | | | | | | | | | | | | | | By unregistering and registering the app with the new appID it is possible to enforce a change of the appID. This is useful for applications/libraries which act as launchers where it is not clear what will be the final appID at compile-time. Change-Id: Id6dc8192e199e6366aa912dd37171ce3f7a698ef Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Merge branch '5.7' into devDominik Holland2016-11-2319-83/+360
|\ \ | |/ | | | | Change-Id: I3feb8544b54c7e84970ae304ea5e8c44bcd30a46
| * Fix compilation against Qt 5.8Louai Al-Khanji2016-11-231-73/+3
| | | | | | | | | | | | | | | | | | | | | | | | The (private!) type traits in Qt 5.8 were switched over to use the std traits. Implement the one type trait that is custom. We can't remove the header, it's public. However, we could move the definition into the cpp file and keep an empty header, but I figure it makes sense to keep it like this. Change-Id: Ia9c0b3504b3c2a5bbc6d889d6915582742aee4fd Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * Doc: Set documentation base URLTopi Reinio2016-11-092-0/+2
| | | | | | | | | | | | | | Needed for linking across doc modules. Change-Id: I2e15830f7de7c54dac07e6ce1b0cbe892e86a62f Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Added Documentation for QtGeniviExtrasDominik Holland2016-11-0910-2/+339
| | | | | | | | | | | | Change-Id: I827e18be98de9818df22048795bcb4bdb22668d1 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
| * Add private accessor for QIviPropertyPrivate from QIviPropertyAndreas Hartmetz2016-11-071-0/+4
| | | | | | | | | | | | | | Required for the override feature in the QtIVI Gammaray plugin. Change-Id: I5dd4bd9a00249631158179be97a7a66d1c4ff4b0 Reviewed-by: Volker Krause <volker.krause@kdab.com>
| * Doc: Change the html file name for the index pageVenugopal Shivashankar2016-11-021-1/+1
| | | | | | | | | | | | | | | | To avoid name conflicts with the Qt reference documentation main index, especially when the documentation set is built for publishing online. Change-Id: I2d45d4ebee0ed7ead492425abae768eee8667e76 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add link to GammaRay documentation to the related content listVolker Krause2016-11-011-0/+1
| | | | | | | | | | Change-Id: I1603796a59d70bbf68cb4ff913c282bfdcc48b5f Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Fix offline documentation buildVolker Krause2016-11-012-2/+2
| | | | | | | | | | | | | | | | We somehow ended up with recursive includes here. Change-Id: Ic37a3005fdeeb8fa26291410a50dba4b7db751b2 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Doc: Update external URL to GammaRay docsTopi Reinio2016-10-311-1/+1
| | | | | | | | | | | | | | GammaRay manual is now available on doc.qt.io Change-Id: I66721ce08d65ca0815fa50fd97fb40376ad4fb8a Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Doc: Fix typo in landing page filenameTopi Reinio2016-10-311-1/+1
| | | | | | | | | | Change-Id: I41dcf11f764acdd1daf240179841bf0f71b8f9f6 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Doc: Add depends to the Neptune UI doc moduleVenugopal Shivashankar2016-10-282-3/+6
| | | | | | | | | | | | Task-number: QTAUTO-252 Change-Id: I7f9bfa9290be6b445eb14550606f569fd61b7482 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
* | QtGeniviExtras: Several DLT logging improvementsDominik Holland2016-11-094-17/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DLT contexts are now registered with the log level matching the severity of the QtLoggingCategory, which is debug if nothing is specified. In addition it is now possible to delay the registration of the DLT context, until it is first used for logging. As an application might want to adapt the logging categories by parsing their own settings file. As DLT doesn't allow to change the log level from the client it's now possible to delay the creation until the client knows what loglevel is needed. The registerUnregisteredContexts() function can be used once all logging categories are defined, to forward the information to DLT. [ChangeLog] DLT context are now registered using the QtLoggingCategories severity Change-Id: I96cf0aa652b97a39b277718337cf1701388b1615 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Updated all project files to use MODULE_VERSIONDominik Holland2016-11-024-4/+0
| | | | | | | | | | | | | | | | | | | | | | Bumped the MODULE_VERSION to 1.1.0 Although MODULE_VERSION were 5.7.0, it's fine to change it to 1.1.0 as all the libraries had their own version set to 1.0.0 Change-Id: Ibd8de1b6ce67b6d152a9c6a046371b84537824e5 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Risto Avila <risto.avila@qt.io>
* | Merge branch '5.7' into devDominik Holland2016-10-1927-192/+367
|\ \ | |/ | | | | Change-Id: I5e601ba33cf50596f873e746e9b107a560c45018
| * Doc: Make switching between online and offline doc templates easierVenugopal Shivashankar2016-10-148-103/+130
| | | | | | | | | | | | | | | | Currently this has to be done manually, which is not ideal. Task-number: AUTOSUITE-16 Change-Id: I13bc04d2a4482296d8b5b2a16a9145cf55d139c4 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * Doc: Added depends to some of the modulesVenugopal Shivashankar2016-09-263-50/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides that: - removed corresponding \externalpage entries - renamed the index page to qtautomotivie-index.html - removed references to Qt Charts and DataVisualization - added a link to QmlLive. Without the depends all the links outside the module boundary has to be external links, which mean each will open in a new browser window. Task-number: QTAUTO-243 Change-Id: I46e2abb8d8a7d834665b04b91cdcf278ae6a3791 Reviewed-by: Alistair Adams <alistair.adams@qt.io>
| * Add some helper functions to still compile with Qt 5.6Dominik Holland2016-09-223-1/+87
| | | | | | | | | | | | | | | | qAsConst and qUtf16Printable will be provided by qtivi itself when it is compiled against a Qt version before Qt 5.7 Change-Id: I8b8fac4bcc0d032c4107881794b30a25fef441f1 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| * Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-178-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made QIviServiceManagerPrivate::findServiceByInterface() const to avoid the use of qAsConst() there; required to mark loadServiceBackendInterface() as const, too. In the tests, replaced patterns of the form zones = ...; zones.removeall("Dummy"); Q_FOREACH(..., zones) with const zones = ... for (... : zones) { if ( == QLatin1String("Dummy")) continue; Change-Id: Ia9537e10f2d9133cbfb88beffabb0a072c3ffefc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * Eradicate Java-style (immutable) iteratorsMarc Mutz2016-09-171-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | There was only one, in QIviConjunctionTerm::toString(). Replaced it with a C++11 ranged for loop. While at it, also port to use QStringBuilder. Change-Id: Ie2675704a22de7b5b1c7cc13d19083fc6ea5c7af Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * Fix duplicated QIviServiceInterface vtable/type_infoMarc Mutz2016-09-173-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QIviServiceInterface was not exported and didn't have its dtor out-of-line, meaning every executable needing it would get its own copy of the vtable (and, thus, type_info object). Fix by exporting the class and making the dtor out-of-line. Fixes UBSan errors such as: tst_servicemanagertest.cpp:178:5: runtime error: member call on address 0x000001060890 which does not point to an object of type 'QIviServiceInterface' 0x000001060880: note: object is base class subobject at offset 16 within object of type 'QIviProxyServiceObject' 00 00 00 00 d0 6a ae d7 cd 2a 00 00 80 2b 06 01 00 00 00 00 58 6b ae d7 cd 2a 00 00 20 34 06 01 ^ ~~~~~~~~~~~~~~~~~~~~~~~ vptr for 'QIviServiceInterface' base class of 'QIviProxyServiceObject' where QIviProxyServiceObject actually inherits QIviServiceInterface (indirectly, via QIviProxyServiceObject, in turn inheriting QObject (causing the offset mentioned in the error) and QIviServiceInterface). Change-Id: Ic63a27ada7b078436c9461064ffcf388614f9847 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * QAbstractZonedFeaturePrivate: Fix duplicated vtable/type_infoMarc Mutz2016-09-172-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractZonedFeaturePrivate was exported, but didn't have its dtor out-of-line, meaning every executable needing it would get its own copy of the vtable (and, thus, type_info object). Fix by making the dtor out-of-line. Fixes tons of UBSan errors of the form: runtime error: member access within address ... which does not point to an object of type 'QIviAbstractFeaturePrivate' ...: note: object is of type 'QIviWindowControlPrivate' (where QIviWindowControl actually *does* inherit QIviAbstractFeature (via QIviAbstractZonedFeature)), e.g. in WindowControlTest. Change-Id: I9f08c1e4c5377a2ee342d7e4f4e5f6433843d6b5 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * ivicore: use Q_UNLIKELY for every qWarning() etcMarc Mutz2016-09-164-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, after checking a condition, we issue a qWarning() or similar, by definition that check is unlikely to be true. Tell the compiler so it can move the error handling code out of the normal code path to increase the effective icache size. Moved conditional code around where possible so that we could always use Q_UNLIKELY, instead of having to revert to Q_LIKELY here and there. In QIviServiceManagerPrivate::loadServiceBackendInterface() factored the error handling into a separate never-inline function warn() that can be called with tail optimization (jmp, not call). Change-Id: I6ea66da047fa9d9ad7a04629c01483a03ffa05df Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| * DLT: Add more checks before trying to register the Logging CategoryDominik Holland2016-08-191-0/+3
| | | | | | | | | | | | | | | | | | We need to make sure that the DLT Application is registered before any category. Also it could happen that someone tries to register an empty LoggingCategory, which needs to be prevented Change-Id: I3c084ee4366cc6c21619e8c1d8642916799613e6 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| * Doc: Qt Automotive Suite: Link to Install instructionsv1.0_QtASTopi Reinio2016-07-043-1/+27
| | | | | | | | | | | | | | | | Install guide for Qt for Device Creation applies for Qt AS - link to it, set up page navigation, and add a TOC entry for Installation page. Change-Id: I6e8d6420c66af576a4d226b4f1e1f7f5ae16f0dd Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
| * Doc: Fixes for linking and table of contentsTopi Reinio2016-06-303-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | The documentation build process for Qt Automotive Suite currently does not have access to other doc sets that we are trying to link to. As a workaround, use external URLs for linking. Also, rename the landing page to index.html and list only the Overview page as a TOC subsection, to avoid duplicating a link to the index page. Change-Id: I7501bb12b09f31185ff134fd7629f9aaf3d70b5e Reviewed-by: Risto Avila <risto.avila@qt.io>
| * Revert "Doc: Fix problems with offline documentation structure and linking"Risto Avila2016-06-291-2/+3
| | | | | | | | | | | | | | | | | | Updated qt base from 5.5 to 5.6 when building qdocs. So this task should not be needed. This reverts commit d51a9a610bdb7a8c02d339475115051bfc626b14. Change-Id: I384bfe7524680a9a782ac1f3e6a22d010d96806e Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
| * Doc: Fix problems with offline documentation structure and linkingTopi Reinio2016-06-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | - If the QDoc version used for generating the docs is < 5.6, the 'doc:page' selector was not recognized, and the TOC was populated with too many entries. As a workaround, disable the TOC completely, leaving only the top-level 'Qt Automotive Suite' entry in the Help contents. - Fix the dependency name to OTA documentation. Change-Id: I07cac35043755f60d4a2fe97ab0316395a0ca16c Reviewed-by: Risto Avila <risto.avila@qt.io>
* | Also update the simulation plugins to the new interface namesDominik Holland2016-09-273-7/+7
| | | | | | | | | | | | | | These were introduced with 7bd4a1f1ee476e38aab923a9315250171145aa73 Change-Id: Ic6baab254f2c5469b870c0c3cf23478129fa4cd4 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Introduced a virtual initialize function into the private base classesDominik Holland2016-07-2820-54/+37
| | | | | | | | | | | | | | This is called automatically by the Feature base class Change-Id: I694bf312ad4a2a87769b6ad2d141b1c02929f9c9 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Changed the plugin interfaces to match the Qt standardDominik Holland2016-07-2835-69/+70
| | | | | | | | | | | | | | | | | | Changed them to defines Renamed them to <classname>_iid Moved them into the Intereface class Change-Id: Iaa009244b5451db3ebf4ed5d5b1bb5d053bebd8a Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* | Fixed coding style issuesDominik Holland2016-07-2727-120/+114
| | | | | | | | | | Change-Id: Ib1812eac61ffa163dd50eeacfc0097881ca277f4 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
View Lorry Controller Status