aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Qt6 port without cmake supportDominik Holland2020-12-0221-80/+76
| | | | | | | All deprecation warnings fixed and all autotest pass. Change-Id: I05d48e9ddd2bf23b900065726d67710eea0e82d0 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* ivigenerator: Make sure deploy-virtualenv.sh is able to fix the lib64 folderDominik Holland2020-12-021-1/+2
| | | | | | | | | | | | On centos the virtualenv contains a lib64 folder which contains all site-packages. To make deploy the virtualenv this folder needs to be replaced by a symlink to the lib folder (which contains all modules/libs). The content of lib64 needs to be copied before the sym-link can be created. Change-Id: I0ec254dc5b16c6f5d94e6b5c6bc9f82252762a1f Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Fix initialization in the constructor of QIviFilterTermPrivateDominik Holland2020-12-021-1/+1
| | | | | Change-Id: Ia7e3d8c7232281338a21675d2eb3a0185cf064b3 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Use the DiscoveryMode enum correctly in all our QML filesDominik Holland2020-12-024-4/+4
| | | | | | | | Similar to C++ we need to use the Type where the enum is defined in for assignments. Change-Id: Id491d591d97915452ebcff8a7f47360be4e2340a Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* tst_qiviabstractfeature: Fix return value of autotestDominik Holland2020-12-021-3/+3
| | | | | | | | The test wasn't failing, if only one of the two classes in their had a failing autotest. Change-Id: Ia1c5d92628373ed516524bc9a29a76d45185e995 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* geniviextras: Fix dlt autotest to use a char array as payload storageDominik Holland2020-12-021-2/+3
| | | | | Change-Id: I5214b98f73416d69a984c9d7e3a547c9d9d2dc9d Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devDominik Holland2020-11-052-0/+3
|\ | | | | | | Change-Id: I02dbc2b93bbfeb3f09ef3b5ed9bb2f6bd78a70e7
| * Bump module version to 5.15.1v5.15.1_QtASDominik Holland2020-09-221-1/+1
| | | | | | | | | | | | Change-Id: Icfbfb671bdc98927536e7f9729c772a721623b20 Fixes: AUTOSUITE-1623 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| * Fix build issuesTopi Reinio2020-08-272-1/+2
| | | | | | | | | | | | | | | | | | | | '$PYTHONHOME' in ivigenerator.prf expanded to 'YTHONHOME'. Running generate.py failed with ImportError: No module named 'tarfile' Change-Id: I22517605b42eb23f46d9b1694b9ce5a516528327 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
| * ivigenerator: Fix python module pathv5.15.0_QtASDominik Holland2020-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | With the newer python versions we need to set the VIRTUAL_ENV in addition to the PYTHONHOME environment variable to make sure the "site-packages" is included in the module search path and to use the correct python lib location. Change-Id: Id6ce17ec91843534d6b3ebc49de7fcb2e889759a Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devDominik Holland2020-07-071-1/+4
|\| | | | | | | Change-Id: I4844aa74bb361610dfff6e381b5a7f68cd990044
| * Bump module version to 5.15.0Dominik Holland2020-06-031-1/+1
| | | | | | | | | | | | Change-Id: Ieb23d4eea24f9ce9dc7c6933af26b31e89819536 Fixes: AUTOSUITE-1586 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-251-1/+4
| |\ | | | | | | | | | Change-Id: If63ab467ba3c3e79164ced194316de56fbb6e825
| | * tst_qiviabstractfeature: Fix wrong QML test case5.14Dominik Holland2020-04-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autodiscovery QML test is trying to set the discoveryMode from Javascript and rediscover manually. Because of QTBUG-83703 the QML code is wrong and is only working because of the previous registration of the Feature using the same name. In Qt6 this won't work anymore and the QML code needs to be fixed to use the original enum. Change-Id: If52c370403958cb86c80d5952bf1efc7cd001dc8 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* | | Build fixDominik Holland2020-06-192-1/+3
| | | | | | | | | | | | | | | Change-Id: I4c9694deb4c03d02304f7675da10a0a4661513eb Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* | | Bump module version to 6.0.0Dominik Holland2020-06-191-1/+1
| | | | | | | | | | | | | | | Change-Id: I627b2df57a927886e14f6e17dc7f3f0d8e9e43ab Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* | | Fix qIviRegisterPendingReplyType to work with the new meta type systemDominik Holland2020-04-271-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | This adds a workaround for QTBUG-83664 and makes sure we registering the correct name for the pending reply. Change-Id: I9d2c09b251820b4bc9b505704b549519da9c7a39 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* | | tst_qivisearchandbrowsemodel: Build fixDominik Holland2020-04-271-0/+33
| | | | | | | | | | | | | | | | | | | | | Implement our own QVariant < and > operators for the autotest Change-Id: I61cddd638610340eede4ae64b12c2fae983f30d2 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* | | Qt6 build fixDominik Holland2020-04-274-12/+13
| | | | | | | | | | | | | | | Change-Id: I896542c585e6dab9e7658053792f3a686c15fa24 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-25205-1476/+4217
|\| | | | | | | | | | | Change-Id: Ibf7057ffe0b3eb4050cebe184bd8d2b2998d1603
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-186-3/+71
| |\| | | | | | | | | | Change-Id: Ibbbcf33783d29c547f438512947c62065e8dee23
| | * ivigenerator: Deprecate old filters and don't use them internallyDominik Holland2020-04-155-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | Removing the number of supported filters should make it easier to maintain them and implement new features. Change-Id: I8d936905ca8ef2ce0a47b5bf55a2166c7fc91b52 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * ivigenerator: Set the export define when building the frontendDominik Holland2020-04-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The users needed to do this themself before, but there is no good reason why this can't be done by the autogenerator directly. Change-Id: Ie0004e295ba2ac4bdd2c03b83346580055487a8d Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-049-29/+72
| |\| | | | | | | | | | Change-Id: I29b4c072c4ce94f1b0cafb937e432c0a0f8245c9
| | * Fix the geniviextras only build configurationDominik Holland2020-04-022-2/+3
| | | | | | | | | | | | | | | Change-Id: I07fd33fe28e5ff82cf0d478d616e9002e88a26fb Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
| | * Bump module version to 5.14.2Dominik Holland2020-04-021-1/+1
| | | | | | | | | | | | | | | | | | Fixes: AUTOSUITE-1542 Change-Id: I7cce6be819e58a689fd2b356a0867fd2101b02e8 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * ivigenerator: Improve the errors for incorrect simulation data in annotationsDominik Holland2020-04-021-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | The error message give now an indication what symbol type the simulationData is intended for and also give more details on what is wrong. Change-Id: I26940d8248cf3f8b4caaf02552112894ad369dd5 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * ivigenerator: Improve support support for zoned default_value dataDominik Holland2020-04-022-14/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating the simulationData for structs the zoned values where ignored and always ended in qface errors. The filter function which generates the simulationData is now able to handle those zoned values as well and they are now also part of the autotests. Change-Id: Ie097b1cba2498d0d1e61fb0524548869c2c96502 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * Improve the flaky tst_qivisimulationengine autotestDominik Holland2020-04-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I6a7a3d2d588674a50ff74fecc49c538e68e37adc Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * tst_qivipendingreply: Fix flaky testFailed_qml()Dominik Holland2020-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of waiting for 100 miliseconds hardcoded we now use a signal spy and increase the wait time to 1000 miliseconds. This should give the test more time if needed. Change-Id: I0cff87cf47bd041664fddc4a602a80055ec9df71 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * ivigenerator: More default_value fixes for the QtRO backend/serverDominik Holland2020-03-312-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to already merged fixes, we cannot use the default_value filter for zoned values for member initialization and should trust the simulation code on that. Also sure all zone objects in the simulation are created before initialize() is called and that a zone object is only created once. This makes sure that initializeDefault() can initialize the zone objects and that subsequent calls to availableZones() don't create new objects and possibly leak memory. Change-Id: If9a4c166d3c53677aa11ebc4afd1455d4868b729 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-2811-35/+50
| |\| | | | | | | | | | Change-Id: I51d9f667bc93bba8bdba3b8970dfefe070511a6d
| | * QIviSimulationGlobalObject: Make the domain checking more type safeDominik Holland2020-03-231-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on the QVariant < and > operators, we now check whether the values can be converted to doubles and compare them after the conversion. As the domain checking is done from JSON files using doubles should be giving us enough precision. Change-Id: Ie516606e68eb03aea103f93bf3243ee10f65c40b Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * Fix operator== for all QIviStandardItem derived typesDominik Holland2020-03-236-15/+15
| | | | | | | | | | | | | | | | | | | | | The operator== wasn't marked as const and because of that didn't work. Change-Id: I6566d86c4864960ee88d1f1d5f0c6974f0125445 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * ivigenerator: Fix broken jinja_error functionDominik Holland2020-03-232-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the refactoring of the ivigenerator we switched to use @contextfunction to retrieve the current qface file for the jinja_error function. While this worked fine, calling jinja_error from our internal filters stopped working as we don't have the context there and switching all filters to get the context first is tedious. Instead switch back to use a global variable again. Change-Id: I489d55e0577d0a73170ec80acd9138f8f4d91abc Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * ivigenerator: Fix generation error with zoned default valuesDominik Holland2020-03-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With zoned default values we cannot initialize the member variables of the autogenerated class anymore. Instead of doing that, we now initialize the members using the default_type_value() filter. We now rely on the provided QML simulation and initializeDefault() as this does also the correct parsing of zoned default values. Change-Id: I810485721bc9535eaa8838ba1b773a80d8758725 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | * Fix invalid simulationData in the qface-ivi-climate exampleDominik Holland2020-03-231-1/+1
| | | | | | | | | | | | | | | Change-Id: I259eb331e0abdb80cc25a2f25c2130596393d37d Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-213-1/+27
| |\| | | | | | | | | | Change-Id: Id1aca0487f2eeedf872ccc40680f8e67cdb8c7c3
| | * Add API to unregister all DLT contextsBernd Weimer2020-03-093-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new API unregisters all logging categories and their associated DLT context Ids. This can be used to change log levels: set new rules and unregister all contexts. Change-Id: I1a21dd49d3e3b21fd6f58a2316c60a6f25b29586 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-075-27/+40
| |\| | | | | | | | | | Change-Id: I8c0b6672cfb3b1dfec7ff8ced392e43518bdb162
| | * Merge remote-tracking branch 'origin/5.13' into 5.14Dominik Holland2020-03-025-27/+40
| | |\ | | | | | | | | | | | | Change-Id: Icbc626704f0cb12f84774a717e7050487a74af9c
| | | * media_qtro: Correctly emit the current state on a reconnectDominik Holland2020-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to also use the fromRemoteObjectVariant() helper function when emitting the current state directly from the initialize() call. Otherwise the QIviMediaPlayer will bail because it can't accept the broken matroska QVariant. Change-Id: I162c90cb64e6a81a7c85674783fb379deea910df Fixes: AUTOSUITE-1475 Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com> Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | | * Host and use our own copy of "virtualenv --relocatable"Dominik Holland2020-02-258-10/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With virtualenv 20, the --relocatable flag got removed and causes build failures in QtIvi. As we still need this functionality for making our virtualenv work after 'make install', we copied the legacy code and converted it into a standalone python script which does the job for now. With virtualenv 20 the complete deploy mechanism changed and is now based on top on venv. To make the new environment relocatable we need to copy additional files as well as read the pyvenv.cfg instead of the old-prefix.txt Change-Id: Ib77bbd2a1c959693bf1ae6ca478086ce2c848036 Fixes: AUTOSUITE-1482 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit f2be418701f451a4d68a4949d996b873b1836305)
| | | * Update qface to version 1.10.1Dominik Holland2020-02-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure pinned versions are used when installing all python dependencies, which is needed as a recent jinja update causes problems. Change-Id: Ia6cfed8169aca8eeac6809807772a448199c433c Fixes: AUTOSUITE-1440 Reviewed-by: Vladimir Minenko <vladimir.minenko@pelagicore.com> Reviewed-by: Robert Griebl <robert.griebl@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| | | * Remove tracking branch from qface submoduleDominik Holland2020-02-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually we always use a commit in the upstream/develop branch, but for the 1.10 bugfix, we need to switch the branch. To make our life easier, remove the tracking branch completely to accept any sha in the CI. Change-Id: Ieb9e003691d4ffab0e1f73737b70936574066877 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | | * ivimedia-simulation-server: Don't show an icon in the dockDominik Holland2020-02-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we need a QGuiApplication for playback on macos, we also get an app icon in the dock. Use QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM to prevent this. Change-Id: I7806e4c8e113c22820cddafa19db34b8bec57a50 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | | * Fix registering the QIviPendingReplies at startupDominik Holland2020-01-202-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a singleShot timer is not the right way as it doesn't make sure the call is really executed in the next event loop run. Instead use QMetaObject::invokeMethod(). Also reorder the qivipendingreply autotest to make sure the QML test is done first, which needs the types to be registered... Change-Id: Id4f8dd1577e653c99fd82e8ab8f93a848f9b1b79 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| | | * Delay the QIviPendingReply type registrationDominik Holland2020-01-171-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QtIviCore is loaded at runtime the init function is executed right away before all types are initialized. This causes a crash on windows and we now delay the initialization until the library is ready. Change-Id: I979f48c811f6a7f10facb59ef381239d5ea80367 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-2213-17/+417
| |\| | | | | | | | | | | | | | Change-Id: I7f22e7e589394456404ae9cc295c18e7700a12d5
| | * | QIviPagingModel: Don't emit a warning when the emitted data is out of rangeDominik Holland2020-02-192-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To notify the QIviPagingModel instance about data changes, e.g. new rows, the dataChanged() signal is used. The QIviPagingModel will check the provided data and report a warning if the data is out of range. While this is correct for using the "DataChanged" fetch mode, where the amount of items is in sync with the backend, it doesn't make sense for the "FetchMore" mode, as the QIviPagingModel instance might not fetched all rows (just the visible ones) and the update is for an area outside of interest. Task-number: AUTOSUITE-1464 Change-Id: I606e141268c7a609e98ffa3081d414a46e1c3d93 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 20:06:04 +0000