diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-02-23 17:11:20 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-02-25 07:19:58 +0000 |
| commit | f562ebf2396eb21f323d22778436fc9c75ce75e2 (patch) | |
| tree | f6d09a04b56b26ab30563b68ff8553612abe0fcd /src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | |
| parent | 343a567e0776f7a96fd60410207d80effd61d479 (diff) | |
| download | qt-creator-f562ebf2396eb21f323d22778436fc9c75ce75e2.tar.gz | |
Mimetypes: Make implementation switchable between new and old
- configure with QTC_USE_NEW_MIMEDATABASE to switch to the new one in
utils/mimetypes2/
- added utils/mimeutils.h header for the Qt Creator specific static
wrappers, that also includes the "public" headers for MimeType et al
from the new or old implementation, depending on configuration
- change all utils/mimetypes/ includes to utils/mimeutils.h
- move the implementation for the wrappers to
utils/mimetypes(2)/mimeutils.cpp
- also move the MimeDatabase declaration in the "old" implementation
back to utils/mimetypes/mimedatabase.h
Change-Id: Ie8de229c035d6cd9a5e4739dc0fa78d9c17228e3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index f4363afe93..0c2a8f1530 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -49,7 +49,6 @@ #include <utils/aspects.h> #include <utils/environment.h> #include <utils/fileutils.h> -#include <utils/mimetypes/mimedatabase.h> #include <utils/qtcprocess.h> #include <utils/winutils.h> |