diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2019-06-28 22:46:20 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2019-07-16 00:38:52 +0000 |
| commit | 9693882d6dc53e3cebb5614d74f205210d75ed20 (patch) | |
| tree | bd44a86e8f49993b7224286bc62bb7ba9cab04bd /LICENSE.GPL3-EXCEPT | |
| parent | 8181363fa90eb651591bf71e1a840e1c998429f4 (diff) | |
Re-fix QtCore resource path changing and prepare for Qt 5.134.9
Commit 9cf8ab3b3d44ac50a1f8d4893d8f70b8aedb18b0 added the #ifdef, but
that of course only works if you don't upgrade Qt compared to what Qt
Creator was compiled with. Instead, attempt both paths and only do that
if the system copy is not found.
Searching the system copy is required to address Qt 5.13's configure
option -no-mimetype-database (used by Linux distributions because the
system copy is always present).
This code will still need work to deal with Qt 5.14 changes.
Task-number: QTCREATORBUG-19600
Task-number: QTCREATORBUG-22636
Change-Id: I6aed4df6a12e43c3ac8efffd15ac952a6e9d4770
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions