diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-03-30 11:59:41 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-01 11:32:28 +0000 |
| commit | cbf28577ef49b6f5b5e45ae2e74143969cbd9327 (patch) | |
| tree | 22631a8f51702e8d3ac5fed2020cd5fc3590fb09 /src/corelib/global/qlibraryinfo.cpp | |
| parent | b716216fc072f5e2fc46a5d95d1a070dfb4ba1c0 (diff) | |
Force length of prefix path to be calculated at runtime
Prevent compilers from calculating strlen at compile time
by using a volatile pointer. This corrupted paths if the
installation path is patched for the binary SDK installer.
Task-number: QTBUG-45307
Change-Id: I624b0409e8b27299475a88eb1cbf03ffef9589c6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 5db2e94602..2912e68580 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -447,7 +447,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) if (!QLibraryInfoPrivate::configuration()) #endif { - const char *path = 0; + const char * volatile path = 0; if (loc == PrefixPath) { path = #ifdef QT_BUILD_QMAKE |