diff options
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)) { |