diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-18 17:45:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-18 17:58:04 +0100 |
| commit | ae89f19384c526d4285ab92b1b7382cc90949767 (patch) | |
| tree | 0a586352ab01db0cf0cd0f7ca9f4f2d56181fb79 /src/windeployqt/main.cpp | |
| parent | f68a35b35f443aaccda25c893088d7795d970f0d (diff) | |
windeployqt: Fix namespaced builds
Namespaced builds did not apply to windeployqt
since it was a host tool in 5.15. This now breaks
with cmake.
Move main() outside the Qt namespace.
Pick-to: 6.0
Fixes: QTBUG-89597
Change-Id: If97f509a150ffb889a778c1436ef59395c63852a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/windeployqt/main.cpp')
| -rw-r--r-- | src/windeployqt/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index b170af951..29626b592 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1607,6 +1607,10 @@ static bool deployWebEngineCore(const QMap<QString, QString> &qmakeVariables, options.updateFileFlags, options.json, errorMessage); } +QT_END_NAMESPACE + +QT_USE_NAMESPACE + int main(int argc, char **argv) { QCoreApplication a(argc, argv); @@ -1688,5 +1692,3 @@ int main(int argc, char **argv) return 0; } - -QT_END_NAMESPACE |