commit 70314aff8ca5d3a1f0b3621e9fecf8c8273a8898 Author: Teemu Holappa Date: Thu Feb 4 14:19:04 2021 +0200 Fix animation parsing The animation and transitions parsing was restricted to a root and safe items only. It's changed so that all the subnodes are gone through instead. Task-number: QSR-1085 Change-Id: I9c90108f03e455654b154b82a727fdcc66b9c20d Reviewed-by: Asmo Saarela M tools/qtsafelayouttool/qsafelayoutgenerator.cpp M tools/qtsafelayouttool/qsafelayoutgenerator.h commit 320f63823fcc1dbfd80aef698b4971b2f740c4f7 Author: Teemu Holappa Date: Tue Jan 26 16:01:57 2021 +0200 Fix the character set to support entire Latin1 charset Fixed also assert which occurred in the free type font engine when building the integration test set. The fix reverts the workaround done for the bug QTBUG-62331. Task-number: QSR-1055 Change-Id: I1ef5e9dec0e5eeeebf1c9bc6e35b32c4da1c87d7 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qpf2.cpp M tools/qtsafelayouttool/qsafetextgenerator.cpp commit 88e20c4425f28af1b97abdd47dc23e824f682194 Author: Teemu Holappa Date: Mon Jan 18 21:34:43 2021 +0200 Fix layout tool exception cases Fixed case where the item width or height is set to 0 in state definition. Fixed case where duration for the transition is not set. Fixed case where both x and width are set so that item goes out of the window boundary. Fixed case where both y and height are set so that item goes out of the window boundary. Fixed case where the only width or height is set. Change-Id: I33c51790d8b7d6cf89eb9f35059fa66c8f045eea Reviewed-by: Jani Launonen M tools/qtsafelayouttool/numberanimation.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.cpp commit a3278a622d9c79fdbcfbc7d05bdc37605fb1442c Author: Jani Launonen Date: Fri Jan 15 13:02:34 2021 +0200 Layouttool: Generate V3 compatible uncompressed bitmaps for debug Layout tool have generated uncompressed bitmaps if built in debug configuration, but they haven't been directly usable for the runtime as they haven't had V3 bitmap headers. For benchmarking purposes loading of uncompressed bitmaps is a nice to have, so the V3 header is added to uncompressed bitmaps, too. Task-number: QSR-812 Change-Id: I092c1cc87e4dec20802c2116b49ec2387ffe307c Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/qsafecontentgenerator.cpp commit 103b99c07ee2bd4659dc2be212e9f6f59cfcb77f Author: Tarja Sundqvist Date: Mon Jan 18 11:27:07 2021 +0200 Update license headers Task-number: QSR-1022 Change-Id: I356c1b8eadd1fcf784aeabbae7a8508133dbb7fa Reviewed-by: Asmo Saarela M tools/qtsafelayouttool/anchors.h M tools/qtsafelayouttool/anchorslayout.cpp M tools/qtsafelayouttool/anchorslayout.h M tools/qtsafelayouttool/column.cpp M tools/qtsafelayouttool/column.h M tools/qtsafelayouttool/columnlayout.cpp M tools/qtsafelayouttool/columnlayout.h M tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp M tools/qtsafelayouttool/compressiontool/qrle32compressor.h M tools/qtsafelayouttool/image.cpp M tools/qtsafelayouttool/image.h M tools/qtsafelayouttool/item.cpp M tools/qtsafelayouttool/item.h M tools/qtsafelayouttool/itemlayout.cpp M tools/qtsafelayouttool/itemlayout.h M tools/qtsafelayouttool/keyframe.cpp M tools/qtsafelayouttool/keyframe.h M tools/qtsafelayouttool/keyframegroup.cpp M tools/qtsafelayouttool/keyframegroup.h M tools/qtsafelayouttool/layouter.cpp M tools/qtsafelayouttool/layouter.h M tools/qtsafelayouttool/main.cpp M tools/qtsafelayouttool/node.cpp M tools/qtsafelayouttool/node.h M tools/qtsafelayouttool/numberanimation.cpp M tools/qtsafelayouttool/numberanimation.h M tools/qtsafelayouttool/picture.cpp M tools/qtsafelayouttool/picture.h M tools/qtsafelayouttool/qimageconverter.cpp M tools/qtsafelayouttool/qimageconverter.h M tools/qtsafelayouttool/qmlvisitor.cpp M tools/qtsafelayouttool/qmlvisitor.h M tools/qtsafelayouttool/qpf2.cpp M tools/qtsafelayouttool/qpf2.h M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafecompressedimagegenerator.h M tools/qtsafelayouttool/qsafecontentfactory.cpp M tools/qtsafelayouttool/qsafecontentfactory.h M tools/qtsafelayouttool/qsafecontentgenerator.cpp M tools/qtsafelayouttool/qsafecontentgenerator.h M tools/qtsafelayouttool/qsafelayoutgenerator.cpp M tools/qtsafelayouttool/qsafelayoutgenerator.h M tools/qtsafelayouttool/qsafeqmlparser.cpp M tools/qtsafelayouttool/qsafeqmlparser.h M tools/qtsafelayouttool/qsafetextgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.h M tools/qtsafelayouttool/row.cpp M tools/qtsafelayouttool/row.h M tools/qtsafelayouttool/rowlayout.cpp M tools/qtsafelayouttool/rowlayout.h M tools/qtsafelayouttool/state.cpp M tools/qtsafelayouttool/state.h M tools/qtsafelayouttool/states.cpp M tools/qtsafelayouttool/states.h M tools/qtsafelayouttool/text.cpp M tools/qtsafelayouttool/text.h M tools/qtsafelayouttool/timeline.cpp M tools/qtsafelayouttool/timeline.h M tools/qtsafelayouttool/timelineanimation.cpp M tools/qtsafelayouttool/timelineanimation.h M tools/qtsafelayouttool/transition.cpp M tools/qtsafelayouttool/transition.h M tools/qtsafercctool/main.cpp M tools/qtsafercctool/rcc.cpp M tools/qtsafercctool/rcc.h commit 4a82b953dffa6098100797654bd815ece1cb890c Author: Teemu Holappa Date: Tue Dec 22 11:56:08 2020 +0200 Add error messages for the exception cases in tooling Added error output if the SafeText is scaled in the state change. Task-number: QSR-989 Change-Id: I6e2252976bfbc67d67c24fffd65df97d731b2bf1 Reviewed-by: Samuli Piippo M tools/qtsafelayouttool/qsafeanimationgenerator.cpp commit 92129fc846569a9ca39e66034fb469c04299de1b Author: Teemu Holappa Date: Mon Dec 21 14:00:20 2020 +0200 Fix FPS calculation in timeline animation Change-Id: Iab4f56d3f4c2cff3ecd1ad0550c7bf13cfac6c13 Reviewed-by: Minna Erälä M tools/qtsafelayouttool/qsafeanimationgenerator.cpp commit e73dfc7730b0328eede6662b1bf8bf393636037b Author: Teemu Holappa Date: Thu Dec 17 13:49:22 2020 +0200 Fix the transition handling The layout tool ignores the target property in the Transition element. The runtime resets the m_inTransition flag if there are several states to be handled. Added integration test case for the case. Task-number: QSR-980 Change-Id: Ice7b83b615759750ce0987787620fd6a962b3650 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/numberanimation.cpp M tools/qtsafelayouttool/numberanimation.h M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/states.cpp M tools/qtsafelayouttool/states.h commit f09dba27fc19cdc372b72b685d31418aecb7c6d9 Author: Teemu Holappa Date: Thu Dec 17 22:07:21 2020 +0200 Fix the boundary calculations in layout tool Task-number: QSR-954 Change-Id: Ic25934b113ca2ff79eff4cc65f56012e19d698a7 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h commit 88848478ea61a507ea130892995a46dd34ada5cd Author: Teemu Holappa Date: Fri Dec 11 15:21:28 2020 +0200 Add possibility to set the window position In certain use cases there are no needed to allocate full screen buffer for the safety data. For those cases the layout position should be possible to change. The layout file and QSR runtime supports to set the layout position. The parser failed to calculate positions if the layout positions does not equal to 0. Now the root element position is parsed and stored to the layout file. The child element positions are not mapped against the global position but related to the root element origin. Added API to set the layout position to the adaptation class. Changed the adaptation classes to set the window position accordinly. Task-number: QSR-954 Change-Id: I641f3ebb1d1b9d724ffd6b2302a1ce2295296a1f Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafelayoutgenerator.cpp commit 0fae93d58d92add35c06c8a114b74f59a6e26c2b Author: Teemu Holappa Date: Wed Dec 9 10:27:05 2020 +0200 Remove dependencies to the resource config from the feature specs Causes compilation fail without Qt core class which is not used in safe app in the target. Change-Id: I35dcd0c139479c81d3a6aa239458eda956ed8503 Reviewed-by: Jani Launonen M tools/featurespec/qtsafelayouttool.prf M tools/featurespec/qtsafercctool.prf commit f33efd620f5924e344197d94fb69c0fd2338949e Author: Teemu Holappa Date: Fri Dec 4 08:09:02 2020 +0200 Fix the API break in feature files Changed the qtsaferenderer.prf to load the both feature files instead of showing the error message to prevent errors when the migrating from the 1.1 to 1.2. Added SAFE_RESOURCES to the OTHER_FILES to make it visible in Qt Creator. Change-Id: I9c8414c9340e3fc2200c1ad5b5c61632f98dbeba Reviewed-by: Samuli Piippo M tools/featurespec/qtsafercctool.prf M tools/featurespec/qtsaferenderer.prf commit 9575f7c63c987b395f259f171f094b5c8ff50571 Author: Teemu Holappa Date: Fri Nov 27 16:14:57 2020 +0200 Fix features files usage It was not possible to generate the safelayout files and use the qsafercctool in the same project because the qtsafercc tool didn't had the depedency to the layout file generation which makes the build to fail. Changed integration tests to use the safercctool to test the safercc integration. Change-Id: I315fb3145139aaf6b5f001d7e7a3ab88a556f40f Reviewed-by: Samuli Piippo M tools/featurespec/qtsafelayouttool.prf M tools/featurespec/qtsafercctool.prf commit be75806a51cd4e066871f35e33122b17d60033f7 Author: Teemu Holappa Date: Tue Nov 17 14:11:57 2020 +0200 Fix compiler warning qgetenv returns QByteArray, using qEnvironmentVariable instead to avoid compile warning regarding the coversion from QByteArray to QString. Change-Id: Id0fa3f8dc7dff1221d085f07020ed3070c7005ef Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp commit bfd807a3bb972ff43e9921a206d2240efbc64113 Author: Teemu Holappa Date: Thu Nov 12 20:18:16 2020 +0200 Fix MISRA issue 14-5-1 A non-member generic function shall only be declared in a namespace that is not an associated namespace. Removed the enum definitions from the SafeRendererGenerics namespace. Change-Id: Id8c7b2278a7d0c82e5f9753a8bd2ca45999729fa Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h M tools/qtsafelayouttool/qsafecontentfactory.cpp M tools/qtsafelayouttool/qsafecontentfactory.h M tools/qtsafelayouttool/qsafecontentgenerator.cpp M tools/qtsafelayouttool/qsafecontentgenerator.h M tools/qtsafelayouttool/qsafelayoutgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.h commit 8c0694de35d0fb81b5f885f2dcf1341ab8f291a6 Author: Teemu Holappa Date: Wed Nov 11 09:07:26 2020 +0200 Enable safercc tool build in Boot2Qt We want to build the run the runtime cases in the COIN using the boot2qt images and the QEMU targets. For building the runtime test cases safercc tool is required. Bootstrap build works only on the Linux host. Change-Id: I89ba92c0e833258f22084f7ffd852394ce512f62 Reviewed-by: Jani Launonen M tools/tools.pro commit 42e9a56921ae05b0b43fec31be7c766e47d87d86 Author: Teemu Holappa Date: Wed Jul 8 16:52:29 2020 +0300 Add support for color transitions in TimeLine animation Change-Id: Ib7f98dadb26b4c2657244b4776f12c7ab83659b1 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/picture.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/text.cpp commit f286e9783fcb876405c7f2f4f6eaa19ad28c4e9e Author: Teemu Holappa Date: Thu Oct 22 20:09:47 2020 +0300 Fix the animations of the text elements Change-Id: I3b7a76e4da60c1337c07a32e113723649a14f98b Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.cpp M tools/qtsafelayouttool/text.cpp M tools/qtsafelayouttool/text.h commit b87fe29bd3e160de6e36513555c086600b011c7c Author: Teemu Holappa Date: Wed Oct 7 18:24:18 2020 +0300 Create the separate configuration file for the safercc tool It is necessary to have an own configuration for the safercc tool for running the tests in the cross-compiling environments. Renamed the qtsaferenderer configuration to the qtsafelayouttool which it actually is. Change-Id: I9fd1f97ab6bb70bfa0764664ea9d51d54b5b8dbd Reviewed-by: Samuli Piippo M tools/featurespec/featurespec.pro A tools/featurespec/qtsafelayouttool.prf A tools/featurespec/qtsafercctool.prf M tools/featurespec/qtsaferenderer-tools.prf M tools/featurespec/qtsaferenderer.prf commit 77d1e1a99f1761c48d34238a780b8184b167d86f Author: Teemu Holappa Date: Mon Oct 12 13:12:29 2020 +0300 Add integration test case for testing the static text Change-Id: If87044acd09c10811796219dee5f72e816bbee9f Reviewed-by: Jani Launonen M tools/qtsafelayouttool/main.cpp commit a03ca2a0edc8faebc6b06b8bb9ddabd4ea44eafa Author: Teemu Holappa Date: Wed Oct 14 13:11:26 2020 +0300 Fix Timeline animation support Fixed bugs found in functional tests. Change-Id: Ie4949e0227fbe63f51b7b42ea304398b88d1a95b Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h commit 77f3d55349b503506509bc2b8922fc2f07c390b7 Author: Teemu Holappa Date: Mon Oct 12 09:41:57 2020 +0300 Fix range validator in the animation generator The logic in validating of X and Y values does not work. Simplified the logic so that values must be inside the window boundaries. Change-Id: I1a8ae31c832f46cfbdc83f4c36739fe445466c04 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h commit a8f3a718d93fb02c02f5122011d6668742793ee8 Author: Jani Launonen Date: Tue Oct 13 12:26:47 2020 +0300 Tools, tools tests: Add support for 64+ sequences in RLE32 Added support for longer than 64k repeating pixel patterns by emitting multiple escapeMark + repeat count words back-to-back in case one repeat count overflows. Added test case to qtlayoutgenerator tool. Task-number: QSR-785 Change-Id: Ie13b431a989388cb78254922dbed887cde6eb573 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp commit 236d9189aaccd8d0c119026dad3cc79e43ff14f4 Author: Teemu Holappa Date: Thu Oct 1 09:38:16 2020 +0300 Fix position calculation in States class It was not taken into account that x and y values are relative to the parent position. Change-Id: I241223479ac6d8c4ce117265275121df4d3127a0 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/states.cpp M tools/qtsafelayouttool/states.h commit deaeaec393ea6d654d8458f8f40e7987d968e1b0 Author: Teemu Holappa Date: Wed Sep 16 16:12:57 2020 +0300 Remove unnecessary warning suppression from qtsafelayout tool Change-Id: Idae5d253404eca66f213c7461ba18d4b2de11e7a Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qtsafelayouttool.pro commit ade535ca4ecd5a607e75b3cc2542a33db5df92b9 Author: Jani Launonen Date: Wed Sep 9 20:26:46 2020 +0300 Docs: Update RLE32Compressor statemachine diagram Task-number: QSR-687 Change-Id: Ie3bce06f4be8c918e9a0f40b4860be0cc967fc3d Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/compressiontool/docs/RLE32_compression_algorithm.plantuml commit d8ab80c6fddb80c3ae5c2bfa2ea6128298435200 Author: Teemu Holappa Date: Wed Jul 8 13:26:36 2020 +0300 Add support for changing color using QtQuick State Color transitions are not handled currently, but color change is supported without transition. Task-number: QSR-306 Change-Id: I31a7def8e52f951e17fca72ce6c2516b64ec63c9 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/item.cpp M tools/qtsafelayouttool/item.h M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/states.cpp commit a411c5b0189ae1669d750ad1f5d7e6035e11cf8b Author: Jani Launonen Date: Fri Sep 4 12:56:35 2020 +0300 Tools: minor sanity fix A space was missing after a while-keyword. Change-Id: I76dd281b19a6e500ea16814a3a3a53580fcff546 Reviewed-by: Kari Hormi M tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp commit c9f8496d7744bad00f8507787f92a7225ca21e12 Author: Jani Launonen Date: Mon Sep 7 18:19:21 2020 +0300 Tools: remove unnecessary includes QSafeCompressedImageGenerator and QSafeTextGenerator do not call directly QRle32Compressor any more so they do not need to include the header. Task-number: QSR-645 Change-Id: I708924aa60bdb0a34ddb2d5d9537af792a411200 Reviewed-by: Kari Hormi M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.cpp commit 5b93aa3ed3bbd40d545f684d0694de304896b24e Author: Teemu Holappa Date: Tue Jul 7 14:46:48 2020 +0300 Add possibility to change the animation frame rate Added possibility to change the set the animation frame by safelayout tool command line argument. Added new qmake property SAFE_TARGET_FPS. Change-Id: I4b6a3ec80d34a73b44e0cf239079e73f85ebd405 Reviewed-by: Jani Launonen M tools/featurespec/qtsaferenderer.prf M tools/qtsafelayouttool/main.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.cpp commit 7997c2c9685da8b880795b52fba3cb151a08c59b Author: Jani Launonen Date: Fri Sep 4 12:36:55 2020 +0300 Tools, tools tests: Fix escaping bug Fixed escaping bug by not allowing selected escapeMark exist in the input stream in the first place. This required some new tests. Also error reporting was improved by more describing enum EStatus instead of just boolean true/false. This in turn required the test cases to be modified. Diagnostic messages to Designer Studio were added for new status values and refactored common code from both QSafeTextGenerator and QSafeCompressedImageGenerator to QSafeContentGenerator to duplicate less code to call compression routine. Task-number: QSR-645 Change-Id: I3a0887834f15b3ec82571500dbb93bdbb5e1dda5 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp M tools/qtsafelayouttool/compressiontool/qrle32compressor.h M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafecontentgenerator.cpp M tools/qtsafelayouttool/qsafecontentgenerator.h M tools/qtsafelayouttool/qsafetextgenerator.cpp commit 5171be45cfa7c4179397474afb4094d4f084cd5c Author: Jani Launonen Date: Wed Sep 2 12:50:07 2020 +0300 Tools: remove unnecessary QSafePictureGenerator class QSafeCompressedImageGenerator class replaces both QSafePictureGenerator and QSafeImageGenerator classes. Removed the first one from the sources. Change-Id: I49c067c4c3879576ac6a3cd6f3d6ef1ee3600cfe Reviewed-by: Harri Hyttinen D tools/qtsafelayouttool/qsafepicturegenerator.cpp D tools/qtsafelayouttool/qsafepicturegenerator.h commit c161123757c715ba69ce66a2d5416263b98ada7e Author: Teemu Holappa Date: Tue Jun 23 16:44:26 2020 +0300 Add support for opacity and scale property changes for TimeLine animation Existing implementation for the Timeline animation did not support that several properties can be changed in the same animation sequence. Task-number: QSR-727 Change-Id: I2b836ee55af6d36a938afddc13b49820940f2d15 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h commit e488c06f85e1338bd908bab376ad23967b4ebe90 Author: Jani Launonen Date: Mon Aug 17 13:09:58 2020 +0300 Tools: remove redundant QSafeImageGenerator As static text, images and pictures are all compressed, the old QSafeImageGenerator class is no longer needed. It is removed. Change-Id: I344b2f287a49d15ce440f47b9538242768a33d39 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/parser.pri M tools/qtsafelayouttool/qsafecontentfactory.h D tools/qtsafelayouttool/qsafeimagegenerator.cpp D tools/qtsafelayouttool/qsafeimagegenerator.h commit 03a5b8c407aacfff2b4e5a513fc2ab626421ec94 Author: Teemu Holappa Date: Tue Jun 16 09:58:38 2020 +0300 Set the default opacity value Task-number: QSR-727 Change-Id: Ia78ae0b4eb61bc7f153b2be5634a7635c79e8587 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/node.cpp commit be3bb75b19961d29851c8257c1a8c6e050d1dc44 Author: Teemu Holappa Date: Mon Jun 15 15:39:35 2020 +0300 There is generated garbage to the end of animation data Change-Id: I699cfdc81f1e2f3f2d060936349f6fa987126193 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp commit 3dd722cf65ad07ea4fd445fcc91861f14a66cdab Author: Teemu Holappa Date: Fri Jun 5 14:17:27 2020 +0300 Fix problem with text layout name generator Changed the layout generator so that layout files and related data assets are generated to an own folder so that duplicate item names does not conflict. Task-number: QSR-666 Change-Id: I2f30cf5b6e15175e961a73586a136ee032728f16 Reviewed-by: Jani Launonen M tools/featurespec/qtsaferenderer.prf M tools/qtsafelayouttool/qsafetextgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.h commit e766b4e8c9271a824d818662fe44ca6fb59a64e3 Author: Teemu Holappa Date: Tue Jun 2 10:52:57 2020 +0300 Fix compression tool to generate same escape marks Animation generator generates the same bitmap twice and the bitmaps are not identical because the escape mark changes between the bitmaps. Changed findEscapeMark to use fixed seed for random generator. Change-Id: I87bf0818179c5f5cdaa6e6821fe24b0948227799 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp commit 9687156f5dc0a05e0518334f72cca018b96382fe Author: Jani Launonen Date: Mon May 18 18:10:42 2020 +0300 Tooling: Fix incorrect path returned from generateImage() Fix that reflects the fix done in a349a832df523e9cd99098910d98b0afce0ff325 Task-number: QSR-661 Change-Id: I0ef6ec67281de6c139f3d050693c4e8ddd045f57 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/qsafetextgenerator.cpp commit 5c616705ffdd7c3849a2e0336e7cfa53158e6aba Author: Teemu Holappa Date: Fri May 15 12:59:32 2020 +0300 Fix the safelayout tool not to generate empty state files Change-Id: I381311ab143916e9d8155371fb6f270ad67a26b5 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp commit 73d7706d73515e869848638bb6541ada2bbee995 Author: Tuomas Heimonen Date: Thu May 14 17:43:37 2020 +0300 Tests: Fix compatibility to forward Qt 5.15 and backward to Qt 5.9 Change-Id: Idff196872f3288c2067c338beb023a3867ae562f Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qpf2.cpp commit 2f841399e293718ef13180c891ae9f1fe9eeab60 Author: Tuomas Heimonen Date: Tue May 12 14:19:17 2020 +0300 Tools: Set version string to tools Change-Id: Ib29698e7dfb1b1f459b7778d5192ee6359177df9 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/main.cpp M tools/qtsafelayouttool/qtsafelayouttool.pro M tools/qtsafercctool/main.cpp M tools/qtsafercctool/qtsafercctool.pro commit a349a832df523e9cd99098910d98b0afce0ff325 Author: Teemu Holappa Date: Mon May 4 08:25:39 2020 +0300 Fix return value of compressed image in debug build Debug build returns the file name with .uncompressed postfix. Change-Id: I344b87a987057291bd5c4500715c55ca7e3b20c9 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp commit f3457a602476e1845a9e7ab47a1baee57bd85866 Author: Jani Launonen Date: Thu Apr 9 09:44:52 2020 +0300 Tooling: Add test for bitmap file formats Now checking bitmap files' headers for correct information from generated files. Task-number: QSR-306 Change-Id: I6fe3cfbe1ce76fcf3f60a08177615bb5a2289603 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp commit f3a8e538c1ef9c344b79259b01bf07ba2eea6a19 Author: Teemu Holappa Date: Mon Apr 27 10:10:19 2020 +0300 Fix qtsafelayout tool version Change-Id: Icb169920f01d93df506abfe0d2ad3b7b8a3a371b Reviewed-by: Tuomas Heimonen M tools/qtsafelayouttool/main.cpp commit a3afe68f03c81a3d50893a467d91a6e7c204431a Author: Teemu Holappa Date: Fri Jan 31 12:10:08 2020 +0200 Add support for scaling animation Change-Id: I49a74d698b9ad5edff1b96f066e259a23a02cdf0 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h M tools/qtsafelayouttool/states.cpp commit 998b3b224e2e446acbcf618bcbf8e3851082e747 Author: Jani Launonen Date: Wed Mar 18 15:17:52 2020 +0200 Add immutable flag to SafeImage and prerendering color to bitmaps To differentiate between SafeImage and SafePicture a flag is set to bitmap file header to indicate immutable (SafeImage) and mutable (SafePicture) bitmaps during bitmap generation in the tooling side. Color used to prerender the SafePicture is written to bitmap header. For the SafeImage the color is written, but is considered "don't care". The reason for prerender color for SafePicture is that we need to render the SafePicture again only if it has color changed from the original. Task-number: QSR-306 Change-Id: Ie56611b1a3961d345ea3f4a85e3702aae1370d55 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/parser.pri M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.cpp commit e87e740a5c98b36073bf0b0ff0095dc59cb6d44c Author: Tuomas Heimonen Date: Thu Apr 2 10:19:10 2020 +0300 qtsafercctool: Add static link options for win32-g++ Task-number: QSR-650 Change-Id: Ic3db807b04b63b1c2ce7950da96cabea4c05a9f5 Reviewed-by: Teemu Holappa M tools/qtsafercctool/qtsafercctool.pro commit 251f757433f75a71d6dc9d87eaaa72c5e1c8b9f1 Author: Jani Launonen Date: Fri Mar 13 16:32:57 2020 +0200 Change image format from ARGB32 to ARGB32_Premultiplied To ensure that SafePictures, SafeImages and SafeText are rendered correctly on embedded graphical backends (i.e. DRM and QNX Screen) the format was changed to premultiplied format so that the alpha and RGB values are already in correct proportion. Task-number: QSR-634 Change-Id: I36fd9bcea02008db1c6e85fdb5b0f1ce547e394d Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/qimageconverter.cpp M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafeimagegenerator.cpp M tools/qtsafelayouttool/qsafepicturegenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.cpp commit 10b915a9be0467d6d4f14d830aab9543ca764d04 Author: Teemu Holappa Date: Tue Mar 3 12:33:51 2020 +0200 Add support for Timeline animation Change-Id: Idc3468932fa842be583ef60d272921b6ceb6fb15 Reviewed-by: Jani Launonen A tools/qtsafelayouttool/keyframe.cpp A tools/qtsafelayouttool/keyframe.h A tools/qtsafelayouttool/keyframegroup.cpp A tools/qtsafelayouttool/keyframegroup.h M tools/qtsafelayouttool/node.h M tools/qtsafelayouttool/parser.pri M tools/qtsafelayouttool/qmlvisitor.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h M tools/qtsafelayouttool/states.cpp M tools/qtsafelayouttool/states.h A tools/qtsafelayouttool/timeline.cpp A tools/qtsafelayouttool/timeline.h A tools/qtsafelayouttool/timelineanimation.cpp A tools/qtsafelayouttool/timelineanimation.h commit 5ed980c6b81d62faf13892501f50723053467c03 Author: Tuomas Heimonen Date: Mon Mar 16 13:31:16 2020 +0200 qtsafelayouttool: Fix build with Qt 5.15 Task-number: QSR-643 Change-Id: Ib7f01727d274dcab8c26102e2ace370f6c01da6d Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qmlvisitor.cpp M tools/qtsafelayouttool/qmlvisitor.h M tools/qtsafelayouttool/qsafeqmlparser.cpp commit d9145b99296a5d3bdcbcf380015a7c985017492d Author: Jani Launonen Date: Tue Feb 25 13:33:46 2020 +0200 Compress static SafeText Added compression to static SafeText to decrease storage requirements and to improve performance. Task-number: QSR-624 Change-Id: Ie63c1e10037375321e189739435fa874970d92c0 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/qsafetextgenerator.cpp commit a2957b5076e950ce15daeb49b4c7983a834383aa Author: Jani Launonen Date: Wed Feb 12 14:24:31 2020 +0200 Make RCC data array 32 byte aligned The bitmaps in resources are read directly during blitting and so for performance reasong should be aligned to at least 4 bytes. MISRA C++ 2008 is based on ISO C++ 2003 standard and does not support alignas() directive, but is nonetheless generated by the RCC now in safe mode. The safe mode is activated by a switch '--safety' and it disables compression. The resulting _data_ is aligned externally to 32 byte boundary and internally the different files are padded so that all subdata starts on 4 byte boundary. RCC version number is now unsigned int with --safety switch as there's no reason for negative version number and it is suffixed with 'U' as other unsigned integers in data. The namespace used with --safety is QSafeRenderer. Task-number: QSR-570 Change-Id: I580bf768de8f6979af0f0e7619b5de5f09bd3df8 Reviewed-by: Teemu Holappa M tools/qtsafercctool/main.cpp M tools/qtsafercctool/rcc.cpp M tools/qtsafercctool/rcc.h commit 0e072d33727844729f11123b7bc56d5569b3dd1a Author: Tuomas Heimonen Date: Mon Feb 24 14:26:54 2020 +0200 qtsafercctool: Remove deprecated QHash::insertMulti Task-number: QSR-626 Change-Id: I414a400cd93e204f804a07940b10157765ffbe7a Reviewed-by: Teemu Holappa M tools/qtsafercctool/rcc.cpp commit 1829ed98e09f8722047f0d5f5aa7ab86ae50843f Author: Teemu Holappa Date: Wed Feb 12 15:18:23 2020 +0200 Add support for opacity animation Change-Id: I5fc803675c5b558cff471107f4535037d5bdd701 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h commit f97102f0b85bc3429ba4d89913b2344880f7df85 Author: Tuomas Heimonen Date: Mon Feb 17 11:49:51 2020 +0200 License header update Bumb copyright year to 2020 Update licensing URL Task-number: QSR-618 Change-Id: I7b23adfb6aa02862c83a31d6c6a0e293acc1bff9 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/anchors.h M tools/qtsafelayouttool/anchorslayout.cpp M tools/qtsafelayouttool/anchorslayout.h M tools/qtsafelayouttool/column.cpp M tools/qtsafelayouttool/column.h M tools/qtsafelayouttool/columnlayout.cpp M tools/qtsafelayouttool/columnlayout.h M tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp M tools/qtsafelayouttool/compressiontool/qrle32compressor.h M tools/qtsafelayouttool/image.cpp M tools/qtsafelayouttool/image.h M tools/qtsafelayouttool/item.cpp M tools/qtsafelayouttool/item.h M tools/qtsafelayouttool/itemlayout.cpp M tools/qtsafelayouttool/itemlayout.h M tools/qtsafelayouttool/layouter.cpp M tools/qtsafelayouttool/layouter.h M tools/qtsafelayouttool/main.cpp M tools/qtsafelayouttool/node.cpp M tools/qtsafelayouttool/node.h M tools/qtsafelayouttool/numberanimation.cpp M tools/qtsafelayouttool/numberanimation.h M tools/qtsafelayouttool/picture.cpp M tools/qtsafelayouttool/picture.h M tools/qtsafelayouttool/qimageconverter.cpp M tools/qtsafelayouttool/qimageconverter.h M tools/qtsafelayouttool/qmlvisitor.cpp M tools/qtsafelayouttool/qmlvisitor.h M tools/qtsafelayouttool/qpf2.cpp M tools/qtsafelayouttool/qpf2.h M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafecompressedimagegenerator.h M tools/qtsafelayouttool/qsafecontentfactory.cpp M tools/qtsafelayouttool/qsafecontentfactory.h M tools/qtsafelayouttool/qsafecontentgenerator.cpp M tools/qtsafelayouttool/qsafecontentgenerator.h M tools/qtsafelayouttool/qsafeimagegenerator.cpp M tools/qtsafelayouttool/qsafeimagegenerator.h M tools/qtsafelayouttool/qsafelayoutgenerator.cpp M tools/qtsafelayouttool/qsafelayoutgenerator.h M tools/qtsafelayouttool/qsafepicturegenerator.cpp M tools/qtsafelayouttool/qsafepicturegenerator.h M tools/qtsafelayouttool/qsafeqmlparser.cpp M tools/qtsafelayouttool/qsafeqmlparser.h M tools/qtsafelayouttool/qsafetextgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.h M tools/qtsafelayouttool/row.cpp M tools/qtsafelayouttool/row.h M tools/qtsafelayouttool/rowlayout.cpp M tools/qtsafelayouttool/rowlayout.h M tools/qtsafelayouttool/state.cpp M tools/qtsafelayouttool/state.h M tools/qtsafelayouttool/states.cpp M tools/qtsafelayouttool/text.cpp M tools/qtsafelayouttool/text.h M tools/qtsafelayouttool/transition.cpp M tools/qtsafelayouttool/transition.h M tools/qtsafercctool/main.cpp M tools/qtsafercctool/rcc.cpp M tools/qtsafercctool/rcc.h commit 5cf56a9d5e9a08cca081943de9a15bc7a7058597 Author: Teemu Holappa Date: Mon Feb 17 09:12:25 2020 +0200 Fix typo Change-Id: I50f48bf4dee38ca8e36bc5c174dc570b68c98c28 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafelayoutgenerator.cpp commit 2a518c4edab843cff7045916dd31474116d51b26 Author: Teemu Holappa Date: Wed Feb 12 15:14:19 2020 +0200 Remove duplicate enum definition Change-Id: I5d7788669d915f0e1b23b3b13051ebb29f542bc6 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafeanimationgenerator.cpp M tools/qtsafelayouttool/qsafeanimationgenerator.h commit fffa33475426bfc411d73aa3c843c4437f34492f Author: Teemu Holappa Date: Wed Feb 12 12:38:50 2020 +0200 Remove white spaces from animation properties Change-Id: I987ea383246d8210878fe7d7ee0d92e507f91d2f Reviewed-by: Jani Launonen M tools/qtsafelayouttool/states.cpp commit aaacf24e4cd4bd0b5081bee7956ee48512513eb2 Author: Teemu Holappa Date: Fri Jan 24 09:49:35 2020 +0200 Suppress deprecated-copy error in rcc tool Change-Id: Idd0fcc630f6f9f8a3db7614bc73decb25d6185e3 Reviewed-by: Tuomas Heimonen M tools/qtsafercctool/qtsafercctool.pro commit d50b470de216fbe1bab1feed4f0778a1e6d34da8 Author: Tuomas Heimonen Date: Tue Jan 21 14:47:13 2020 +0200 qtsafercctool: Remove bootstrap from debug builds Change-Id: I6ec89a2a0260aefeb53236b094fcb91348e1f34e Reviewed-by: Teemu Holappa M tools/qtsafercctool/qtsafercctool.pro commit d27514ed76a09ed11155ffac3e9f739e6489fd23 Author: Tuomas Heimonen Date: Fri Jan 17 15:37:56 2020 +0200 qtsaferenderer-tools.prf: Remove error if tools are not found Task-number: QSR-602 Change-Id: I79238aa02b7a7aecdd227bffccf8cac8c2bd385b Reviewed-by: Samuli Piippo M tools/featurespec/qtsaferenderer-tools.prf M tools/featurespec/qtsaferenderer.prf commit 72f06b1a9fd5032573261aaf6340b83a6fdc6187 Author: Jani Launonen Date: Mon Jan 13 17:31:30 2020 +0200 Fix endianness in compression tool To generate bitmaps correctly the input to compressor had to be changed to little endian and this resulted in changes in qsafecompressorimagegenerator.cpp's checks and unit tests. Task-number: QSR-574 Change-Id: Ic0cd858f06e0417464c9210593600d71933cc3b2 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp commit 608c38d710b001c3c08aba24998b3dde77c07145 Author: Jani Launonen Date: Wed Jan 15 13:04:05 2020 +0200 Move runtime and tooling shared defines to shareddef.h Moved some leftover defines from QSafeBitmapReader.h to shareddef.h Task-number: QSR-588 Change-Id: I09337badcc49f7d4370bd8eb214821a577f7be8d Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp commit 3012a93673c3c617138fc866b2f6be4ac1ba55bb Author: Jani Launonen Date: Wed Jan 8 13:31:02 2020 +0200 Make QML SafePictures RLE compressed too Consolidated both SafePicture and SafeImage QML types to be RLE compressed by QSafeCompressedImageGenerator class. Later on this initial RLE support should be made work with SafeText and fonts. Task-number: QSR-574 Change-Id: Ia466c222b70e57a3d08d734cb5e5108cc5a40e0b Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafecontentfactory.h commit 15e225144993596bf57ca09df8f567497b22f0db Author: Tuomas Heimonen Date: Fri Nov 22 12:10:02 2019 +0200 safercc: Update namespace to 'Saferenderer' Task-number: QSR-589 Change-Id: Ibd179dcf895fd267ed6b9e620ec5cb3ad7634785 Reviewed-by: Teemu Holappa M tools/featurespec/qtsaferenderer.prf M tools/qtsafercctool/rcc.cpp M tools/qtsafercctool/rcc.h commit 4b86897fc5e9877c44c456a5f72060a12e0f9b53 Author: Teemu Holappa Date: Mon Aug 5 11:43:17 2019 +0300 Add QML transition and animation support to the layout tool Change-Id: I38515e4251d0adf9e412a290b1be3fd2414e3d01 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/item.cpp M tools/qtsafelayouttool/item.h M tools/qtsafelayouttool/node.h A tools/qtsafelayouttool/numberanimation.cpp A tools/qtsafelayouttool/numberanimation.h M tools/qtsafelayouttool/parser.pri M tools/qtsafelayouttool/qmlvisitor.cpp M tools/qtsafelayouttool/qmlvisitor.h A tools/qtsafelayouttool/qsafeanimationgenerator.cpp A tools/qtsafelayouttool/qsafeanimationgenerator.h M tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp M tools/qtsafelayouttool/qsafecompressedimagegenerator.h A tools/qtsafelayouttool/qsafecontentfactory.cpp M tools/qtsafelayouttool/qsafecontentfactory.h M tools/qtsafelayouttool/qsafecontentgenerator.cpp M tools/qtsafelayouttool/qsafecontentgenerator.h D tools/qtsafelayouttool/qsafedatafactory.cpp M tools/qtsafelayouttool/qsafeimagegenerator.cpp M tools/qtsafelayouttool/qsafeimagegenerator.h M tools/qtsafelayouttool/qsafelayoutgenerator.cpp M tools/qtsafelayouttool/qsafelayoutgenerator.h M tools/qtsafelayouttool/qsafepicturegenerator.cpp M tools/qtsafelayouttool/qsafepicturegenerator.h M tools/qtsafelayouttool/qsafetextgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.h M tools/qtsafelayouttool/qtsafelayouttool.pro A tools/qtsafelayouttool/state.cpp A tools/qtsafelayouttool/state.h A tools/qtsafelayouttool/states.cpp A tools/qtsafelayouttool/states.h A tools/qtsafelayouttool/transition.cpp A tools/qtsafelayouttool/transition.h commit 9546f17b7a538dc82dcec548072fb7c107c105aa Author: Jani Launonen Date: Mon Nov 4 14:00:08 2019 +0200 Add support generating compressed bitmaps from qsafelayouttool QSafeLayoutTool now generates RLE32 compressed bitmaps. Unit tests for simple cases are included. Resource files in tst_eventhandler are not build anew because resource filea are not yet compatible with compressed bitmaps' requirement of 32-bit alignment. Task-number: QSR-524 Change-Id: Ica49ddc8cffc1712142a7931f01293cf9aea07d0 Reviewed-by: Teemu Holappa A tools/qtsafelayouttool/compressiontool/qrle32compressor.cpp A tools/qtsafelayouttool/compressiontool/qrle32compressor.h M tools/qtsafelayouttool/parser.pri A tools/qtsafelayouttool/qsafecompressedimagegenerator.cpp A tools/qtsafelayouttool/qsafecompressedimagegenerator.h M tools/qtsafelayouttool/qsafecontentfactory.h commit 93081fe840283c4e3f7eba95c02c6d3c86c8b383 Author: Jani Launonen Date: Thu Nov 28 16:41:31 2019 +0200 Add RLE32 compression algorithm statemachine chart Added RLE32 compression algorithm statemachine chart as it now works. The statemachine chart is not quite 1:1 to implementation because of different language constraints in UML and C++, but idea should come through. Task-number: QSR-530 Change-Id: I6fcaf6e2035ca633b1fc221c1dfd3f0d7c4b8b5f Reviewed-by: Tuomas Heimonen Reviewed-by: Teemu Holappa A tools/qtsafelayouttool/compressiontool/docs/RLE32_compression_algorithm.plantuml A tools/qtsafelayouttool/compressiontool/docs/RLE32_compression_algorithm.svg commit 74d16b30c4bac5467ba7de0d6ec9a546b9d6e160 Author: Samuli Piippo Date: Wed Nov 27 13:37:12 2019 +0200 Add missing includes Build fails now with Qt 5.14 where syncqt has been fixed to not create incorrect QList header which was used here as well. Task-number: QSR-592 Change-Id: I8fdc2f37e02fcb3422680721670c76c3a3b08856 Reviewed-by: Teemu Holappa M tools/qtsafelayouttool/item.h M tools/qtsafelayouttool/node.h commit 34ebecacdc63cb1622f32ae26427e4ed9e521107 Author: Teemu Holappa Date: Tue Nov 12 13:06:47 2019 +0200 Add common header for sharing datatypes between runtime and tooling Change-Id: I63d84e7fe4efaeec796e1706f471773b29ae3fc2 Reviewed-by: Jani Launonen M tools/qtsafelayouttool/qsafecontentfactory.h M tools/qtsafelayouttool/qsafecontentgenerator.h M tools/qtsafelayouttool/qsafedatafactory.cpp M tools/qtsafelayouttool/qsafelayoutgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.cpp M tools/qtsafelayouttool/qsafetextgenerator.h commit 0c6b71398161b9ba2f4cd1576c2468a5f05582e0 Author: Tuomas Heimonen Date: Thu Nov 14 12:39:36 2019 +0200 qtsafercctool: Change to use rcc fork fork base is qtbase SHA1: f0b93f7a4b4281c5470280eb36b7c0ef5948a921 v5.12.6 sources path tools/qtsafercctool copied from qtbase/src/tools/rcc test path tests/auto/safercc copied from qtbase/tests/auto/tools/rcc file tools/qtsafercctool/rcc.pro renamed to tools/qtsafercctool/qtsafercctool.pro in tools/qtsafercctool/qtsafercctool.pro changed 'QMAKE_TARGET_DESCRIPTION = "Qt Saferenderer Resource Compiler"' file tests/auto/safercc/rcc.pro renamed to tests/auto/safercc/safercc.pro in tests/auto/safercc/tst_rcc.cpp:72 test binary name 'rcc' changed to 'qtsafercctool' Task-number: QSR-573 Change-Id: I867d6861b039a2ba6241e4af7fcae31ffee15ff6 Reviewed-by: Teemu Holappa A tools/qtsafercctool/main.cpp M tools/qtsafercctool/qtsafercctool.pro A tools/qtsafercctool/rcc.cpp A tools/qtsafercctool/rcc.h A tools/qtsafercctool/rcc.pri commit edd19704488409e7e14f8f0003e0f6fe7d8986da Author: Tuomas Heimonen Date: Thu Nov 7 11:39:44 2019 +0200 Fix cannot create bitmaps if the source folder name has spaces Task-number: QSR-436 Change-Id: I37378d9e78af7cb473ec9d1f113eb710762f4a88 Reviewed-by: Teemu Holappa M tools/featurespec/qtsaferenderer.prf commit 72d16fc18fbc496ba9edf79bccdf0aa944cf9ab0 Author: Tuomas Heimonen Date: Wed Oct 16 15:00:45 2019 +0300 Add support for qtsafercctool In build Qt rcc is copied to QSR build_path/bin/qtsafercctool. In install it is copied to QT_INSTALL_BINS. Search path for qtsafelayouttool and qtsafercctool - QSR_build_path/bin, (e.g. /work/qsr/bin) - QT_HOST_BINS, (e.g. /qt/5.12.5/gcc_64/bin) - Qt_install_path/Tools/QSR_version/bin (e.g. /qt/Tools/QSR-1.2.0/bin) Additional fallback qtsafercctool as Qt resource compiler if not found. Task-number: QSR-561 Change-Id: I41a9a340c853f40cb45080ad4e953e45aab0f5b5 Reviewed-by: Teemu Holappa M tools/featurespec/qtsaferenderer-tools.prf M tools/featurespec/qtsaferenderer.prf A tools/qtsafercctool/qtsafercctool.pro M tools/tools.pro commit a50d24dbf686cb1087f0f6f9564daebc34bee50b Author: Tuomas Heimonen Date: Thu Oct 3 12:01:18 2019 +0300 featurespec: Fix qtsafelayouttool retrieval Change-Id: I0a91703692590350ba59231f6386e5c83d5adb26 Reviewed-by: Teemu Holappa M tools/featurespec/qtsaferenderer-tools.prf commit a4246ff055ebed215bfbe905b83508c384289d57 Merge: 5352c09 6e3acb4 Author: Tuomas Heimonen Date: Wed Oct 16 12:32:12 2019 +0300 Merge branch '1.1' Task-number: QSR-503 Change-Id: I2dcd3084e709d604827ba65954fd318d3ecd1d32 commit 5112858f8f1cc38ba1a330bb97ec34579e581a1e Merge: 19e924b 76e19ec Author: Teemu Holappa Date: Fri Sep 13 14:40:45 2019 +0300 Merge branch '1.1' into master Change-Id: I10cd88e79bd48785d446a377b8021ea8ca19b32c commit 94ad060c543d13035d2b0d7ca2fe4c643b6244cc Author: Teemu Holappa Date: Fri Sep 27 15:10:49 2019 +0300 Fix row layout vertical position calculation Task-number: QSR-468 Change-Id: Ib7cc22cec091241731da4f3bbfb5c90d40cb8aa3 Reviewed-by: Tuomas Heimonen M tools/qtsafelayouttool/rowlayout.cpp