diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2020-03-10 12:48:29 +0100 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@gmail.com> | 2020-03-10 17:05:37 +0100 |
| commit | d4207cb1a95ac866faf61df388fcd7963ccc72e7 (patch) | |
| tree | 3bb16e1d83cf7c33b7194c667ab4cc766d239e9a /src/corelib | |
| parent | 3dd13d4075a250aa5070b97858a3115d5192e6f6 (diff) | |
Mimetypes: Build fix for Android builds on Windows
Due to Android's multi-abi the build will fail due to concurrent
access:
cmd /c C:\Projects\Qt\repo\qtbase\src\corelib\mimetypes\mime\generate.bat C:\Projects\Qt\repo\qtbase\src\corelib\mimetypes\mime\packages\freedesktop.org.xml > .rcc\qmimeprovider_database.cpp
The process cannot access the file because it is being used by another process.
Change-Id: I647e0a6d8aa03cf116b08a1dce6e61e8882661f4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib')
| -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 |