diff options
| author | Tarja Sundqvist <[email protected]> | 2025-06-03 13:43:30 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2025-06-03 13:43:30 +0300 |
| commit | 4a6a9dcc73b82cd49a846d5eadadc1835d7b0ec8 (patch) | |
| tree | 2f027d908308b8ad503b746cd9012fbc98ea32f2 /src/tools/qtpaths/qtpaths.cpp | |
| parent | 3fe9e69e4d7510480544f928e8a07f0f110b2181 (diff) | |
| parent | 5d8e9a8415562ba004b38508d91e1fa0254c17d3 (diff) | |
Merge tag 'v6.5.6-lts-lgpl' into 6.56.5
Qt 6.5.6-lts-lgpl release
Diffstat (limited to 'src/tools/qtpaths/qtpaths.cpp')
| -rw-r--r-- | src/tools/qtpaths/qtpaths.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qtpaths/qtpaths.cpp b/src/tools/qtpaths/qtpaths.cpp index db101efca59..dd42c73cdce 100644 --- a/src/tools/qtpaths/qtpaths.cpp +++ b/src/tools/qtpaths/qtpaths.cpp @@ -222,7 +222,7 @@ int main(int argc, char **argv) #if QT_CONFIG(settings) if (parser.isSet(qtconf)) { qtconfManualPath = parser.value(qtconf); - QLibraryInfoPrivate::qtconfManualPath = &qtconfManualPath; + QLibraryInfoPrivate::setQtconfManualPath(&qtconfManualPath); } #endif @@ -253,7 +253,7 @@ int main(int argc, char **argv) } QT_WARNING_PUSH -#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1300 && Q_CC_GNU < 1400 +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1300 && Q_CC_GNU < 1500 QT_WARNING_DISABLE_GCC("-Wdangling-reference") #endif if (parser.isSet(display)) { |