diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-01 10:27:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-02 09:24:11 +0100 |
| commit | d7e4980132057aa10e54137114bf65e06c455030 (patch) | |
| tree | 9d6ae36efa0cf84a612bfec6cf3dd2ea7f7e3446 /src/corelib/tools/qt_attribution.json | |
| parent | 44c402b4bfba44480382244b8409fb3cf34d7ac1 (diff) | |
| parent | a732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/mac/sdk.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/sdk.prf
src/angle/src/libEGL/libEGL.pro
src/platformsupport/fontdatabases/fontdatabases.pro
src/platformsupport/platformsupport.pro
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
tests/auto/widgets/widgets/qmenubar/BLACKLIST
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c
Diffstat (limited to 'src/corelib/tools/qt_attribution.json')
| -rw-r--r-- | src/corelib/tools/qt_attribution.json | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/tools/qt_attribution.json new file mode 100644 index 0000000000..eec2cd6795 --- /dev/null +++ b/src/corelib/tools/qt_attribution.json @@ -0,0 +1,13 @@ +{ + "Id": "cldr-data", + "Name": "Unicode CLDR (Unicode Common Locale Data Repository)", + "QDocModule": "qtcore", + "QtUsage": "Used in Qt Core (QTimeZone). Disable the timezone feature to avoid.", + "Files": "qlocale_data_p.h", + + "Description": "QTimeZone includes data obtained from the CLDR data files.", + "License": "Unicode Data Files and Software License", + "LicenseId": "Unicode-TOU", + "LicenseFile": "CLDR_LICENSE.txt", + "Copyright": "Copyright (C) 1991-2016 Unicode, Inc." +} |