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/qtsafercctool/main.cpp M tools/qtsafercctool/rcc.cpp M tools/qtsafercctool/rcc.h 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/qtsafercctool/main.cpp M tools/qtsafercctool/qtsafercctool.pro 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 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 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/qtsafercctool/main.cpp M tools/qtsafercctool/rcc.cpp M tools/qtsafercctool/rcc.h 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 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/qtsafercctool/rcc.cpp M tools/qtsafercctool/rcc.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 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 A tools/qtsafercctool/qtsafercctool.pro