diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-07-13 14:58:22 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-07-13 13:22:03 +0000 |
| commit | 2b2ec45bc9f40caf19b98aeaafba6439bff6d9b4 (patch) | |
| tree | ec69c7a15c65b5eecc095f2806ac4431ba6bd2b8 | |
| parent | 501fdb68df6bff238e03672793cdd12a70a641b4 (diff) | |
Provide an internal qt.conf
This prevents Qt from loading qt.conf from Qt's prefix path.
Change-Id: Id8357e4e892bddba581eec8e6ea301ecc2ff6702
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | changelog.txt | 1 | ||||
| -rw-r--r-- | src/app/app.pro | 1 | ||||
| -rw-r--r-- | src/app/app.qrc | 5 | ||||
| -rw-r--r-- | src/app/qt.conf | 0 |
4 files changed, 7 insertions, 0 deletions
diff --git a/changelog.txt b/changelog.txt index 1b96663..e901a46 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ This is the changelog for jom 1.1.3, the parallel make tool. Changes since jom 1.1.2 - Removed the /KEEPTEMPFILES option. This option only worked for top-level make files anyway and was less useful than intended. Use the /U option to display the content of inline files instead. +- Fixed an issue where jom.exe would try to load qt.conf from drive E. Changes since jom 1.1.1 - Fixed exit code propagation in xgejom.bat and ibjom.bat (QTCREATORBUG-16619). diff --git a/src/app/app.pro b/src/app/app.pro index 6ff0135..c6b54c6 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -18,3 +18,4 @@ contains(QMAKE_CXXFLAGS_RELEASE, -MT) { INCLUDEPATH += ../jomlib HEADERS = application.h SOURCES = main.cpp application.cpp +RESOURCES = app.qrc diff --git a/src/app/app.qrc b/src/app/app.qrc new file mode 100644 index 0000000..03a1bfc --- /dev/null +++ b/src/app/app.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/qt/etc"> + <file>qt.conf</file> + </qresource> +</RCC> diff --git a/src/app/qt.conf b/src/app/qt.conf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/app/qt.conf |