-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove a duplicate inclusion of qlocale_data_p.h
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. Pick-to: 6.8 6.5 6.2 Task-number: QTBUG-128930 Change-Id: Ie5ebdf508a622eeca93f8785bc09b086502aa0e2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
- Loading branch information
1 parent
58ddd0a
commit 96c0765
Showing
3 changed files
with
21 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters