ac6f080d16
In tst_qlocale.cpp there was a #include that caused the static data tables to be duplicated, violating ODR. All it actually needed was the ability to iterate all rows of the locale_data[] table, so export a method to do that from QLocaleData and have the test run that instead of pulling in a second copy of the tables. Conflict resolution at 6.8 needed the declaration of locale_data_size moved up qlocale.cpp, which happened after 6.8 as part of other work that isn't included in 6.8. Pick-to: 6.5 6.2 Task-number: QTBUG-128930 Change-Id: Ie5ebdf508a622eeca93f8785bc09b086502aa0e2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 96c07655c46afdd3e2da7ef7d339b518d36c83c5) Reviewed-by: Marc Mutz <marc.mutz@qt.io> |
||
|---|---|---|
| .. | ||
| syslocaleapp | ||
| test | ||
| .gitignore | ||
| CMakeLists.txt | ||
| tst_qlocale.cpp | ||