diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:56 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-11 15:34:21 +0100 |
| commit | 865afac25036d58b18794384e37d42931b2164c5 (patch) | |
| tree | e18d31138f1a8b9200764fd3648e58b9dd6b124f /src/corelib/mimetypes | |
| parent | 01bacdf7abb071198d843acdfb22ce1701766be8 (diff) | |
| parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ibee5acec72a1a1769d4bc5f23f56c7dc8d4cf3cb
Diffstat (limited to 'src/corelib/mimetypes')
| -rw-r--r-- | src/corelib/mimetypes/mimetypes.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/mimetypes.pri b/src/corelib/mimetypes/mimetypes.pri index 8cbe7b69ae..288ccf063e 100644 --- a/src/corelib/mimetypes/mimetypes.pri +++ b/src/corelib/mimetypes/mimetypes.pri @@ -26,9 +26,12 @@ qtConfig(mimetype) { qtConfig(mimetype-database) { outpath = .rcc + android { + outpath = $$outpath/$${QT_ARCH} + } debug_and_release { - CONFIG(debug, debug|release): outpath = .rcc/debug - else: outpath = .rcc/release + CONFIG(debug, debug|release): outpath = $$outpath/debug + else: outpath = $$outpath/release } mimedb.depends = $$PWD/mime/generate.pl |