diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2024-03-11 12:07:29 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2024-03-11 12:33:39 +0200 |
| commit | 895855c02c466859ecd981cb1daec485d23b949b (patch) | |
| tree | 9faf987b7d6ab6d126f33b4a1b77f7a8b35e02a9 /src | |
| parent | db2e634513036af4376d002567ef0f006ea6cc75 (diff) | |
Include minimal qt.conf file
Qt uses qt.conf file to load various Qt paths. To prevent that installer
would accidently use the qt.conf file which does not belong to it,
generate dummy qt.conf file so that the installer won't break.
Task-number: QTIFW-3292
Change-Id: I22cf745f991e33607de12e43f2c8c6665b1714e3
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/resources/installer.qrc | 1 | ||||
| -rw-r--r-- | src/libs/installer/resources/qt/etc/qt.conf | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/installer/resources/installer.qrc b/src/libs/installer/resources/installer.qrc index 48a7c65bd..a3855b5c4 100644 --- a/src/libs/installer/resources/installer.qrc +++ b/src/libs/installer/resources/installer.qrc @@ -7,5 +7,6 @@ <file>uninstall.png</file> <file>keepinstalled.png</file> <file>keepuninstalled.png</file> + <file>qt/etc/qt.conf</file> </qresource> </RCC> diff --git a/src/libs/installer/resources/qt/etc/qt.conf b/src/libs/installer/resources/qt/etc/qt.conf new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/libs/installer/resources/qt/etc/qt.conf |