diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:55:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:19 +0000 |
| commit | 190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch) | |
| tree | 3feb15de63b05cda8339d784c46f929ad4000357 /src/corelib/global/qconfig.cpp.in | |
| parent | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff) | |
Regenerate files after dev -> wip/cmake merge
Note the following bigger things that had to be done:
Handle GSS library / feature with a new custom find module.
Implement rudimentary support for relocatability (does not currently
handle extprefix).
Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/global/qconfig.cpp.in')
| -rw-r--r-- | src/corelib/global/qconfig.cpp.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in index 7a5eeb0b04..7fa21bcfed 100644 --- a/src/corelib/global/qconfig.cpp.in +++ b/src/corelib/global/qconfig.cpp.in @@ -18,7 +18,10 @@ static const char qt_configure_strs[] = @QT_CONFIG_STRS_SECOND@ #endif ; -#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg" +#define QT_CONFIGURE_SETTINGS_PATH "@QT_DEFAULT_SYS_CONF_DIR@" +#define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "@QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH@" +#define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH@" +#define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH@" #ifdef QT_BUILD_QMAKE # define QT_CONFIGURE_SYSROOTIFY_PREFIX false #endif |