summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-07-13 14:58:22 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2017-07-13 13:22:03 +0000
commit2b2ec45bc9f40caf19b98aeaafba6439bff6d9b4 (patch)
treeec69c7a15c65b5eecc095f2806ac4431ba6bd2b8 /src
parent501fdb68df6bff238e03672793cdd12a70a641b4 (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>
Diffstat (limited to 'src')
-rw-r--r--src/app/app.pro1
-rw-r--r--src/app/app.qrc5
-rw-r--r--src/app/qt.conf0
3 files changed, 6 insertions, 0 deletions
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