diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-18 15:23:03 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-18 16:42:58 +0200 |
| commit | bc09d5b11cd45e975ec745b508c703b75b019a4e (patch) | |
| tree | 70deb85b696c64ad8b2e487deb5e9ae55a06a310 /tools/shared | |
| parent | dfd5ee41532b55ef6aaa5fb7ed3b586fbac80fce (diff) | |
| download | qt4-tools-bc09d5b11cd45e975ec745b508c703b75b019a4e.tar.gz | |
Resolve EPOCROOT in qt.conf using same logic as in .pro
Previously it was only possible to use EPOCROOT in qt.conf via env
variable, while qmake & configure could resolve it also via devices.xml.
Changed qt.conf parsing to support $${EPOCROOT} tag and use same
resolving logic as qmake & configure.
Task-number: QTBUG-15393
Reviewed-by: axis
Diffstat (limited to 'tools/shared')
| -rw-r--r-- | tools/shared/symbian/epocroot.pri | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/shared/symbian/epocroot.pri b/tools/shared/symbian/epocroot.pri new file mode 100644 index 0000000000..117836e73c --- /dev/null +++ b/tools/shared/symbian/epocroot.pri @@ -0,0 +1,11 @@ +# Epocroot resolving is only required for tools, so omit it from all mobile/embedded builds +!symbian:!wince*:!embedded { +HEADERS += \ + $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.h \ + $$QT_SOURCE_TREE/tools/shared/windows/registry.h +SOURCES += \ + $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \ + $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp +INCLUDEPATH += $$QT_SOURCE_TREE/tools/shared +DEFINES += QLIBRARYINFO_EPOCROOT +} |