diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-10 10:00:52 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-10 10:00:52 +0200 |
| commit | a00a88e0e35470c941bcb47bf39a135d0c6da53b (patch) | |
| tree | f34038d06df55f9d0728239cdf508ff9c0ea38b1 /examples | |
| parent | c6db81a9cf852474bb020f3ea8534998deb599f7 (diff) | |
| parent | 31eada8ecaabb1a969f315fe46d35971f61c6e83 (diff) | |
| download | qtlocation-a00a88e0e35470c941bcb47bf39a135d0c6da53b.tar.gz | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I206cf010f01d2acdad05357e992a2703e5392aab
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/location/mapviewer/main.cpp | 4 | ||||
| -rw-r--r-- | examples/location/places/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/location/mapviewer/main.cpp b/examples/location/mapviewer/main.cpp index b332de8c..ec54b5a2 100644 --- a/examples/location/mapviewer/main.cpp +++ b/examples/location/mapviewer/main.cpp @@ -66,8 +66,8 @@ static bool parseArgs(QStringList& args, QVariantMap& parameters) if (param.startsWith("--help")) { QTextStream out(stdout); - out << "Usage: " << endl; - out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << endl; + out << "Usage: " << Qt::endl; + out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << Qt::endl; out.flush(); return true; } diff --git a/examples/location/places/main.cpp b/examples/location/places/main.cpp index c677e429..69d31ae8 100644 --- a/examples/location/places/main.cpp +++ b/examples/location/places/main.cpp @@ -63,8 +63,8 @@ static bool parseArgs(QStringList& args, QVariantMap& parameters) if (param.startsWith("--help")) { QTextStream out(stdout); - out << "Usage: " << endl; - out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << endl; + out << "Usage: " << Qt::endl; + out << "--plugin.<parameter_name> <parameter_value> - Sets parameter = value for plugin" << Qt::endl; out.flush(); return true; } |