summaryrefslogtreecommitdiffstats
path: root/src/tools/qwebengine_convert_dict/main.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-02 12:02:04 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-11-02 12:56:38 +0000
commitccf8ba23c27fdbbc5750e92310593749baf95ee9 (patch)
treed7495ba213b3bdf0a25c283f7dd9afa55c8b7d03 /src/tools/qwebengine_convert_dict/main.cpp
parent2469c4dbb18b957c981a36e9aee3009f910f6c65 (diff)
parent3d0d0afe573d1c568f1f5c0eba647eff993dcb81 (diff)
Merge "Merge branch '5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/tools/qwebengine_convert_dict/main.cpp')
-rw-r--r--src/tools/qwebengine_convert_dict/main.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/qwebengine_convert_dict/main.cpp b/src/tools/qwebengine_convert_dict/main.cpp
index e7dcc22d9..3a1a1ff64 100644
--- a/src/tools/qwebengine_convert_dict/main.cpp
+++ b/src/tools/qwebengine_convert_dict/main.cpp
@@ -30,6 +30,7 @@
#include <QTextStream>
#include <QLibraryInfo>
#include <QDir>
+#include <QCoreApplication>
// see also src/core/type_conversion.h
inline base::FilePath::StringType toFilePathString(const QString &str)
@@ -117,6 +118,11 @@ QString frameworkIcuDataPath()
int main(int argc, char *argv[])
{
+ // Required only for making QLibraryInfo::location() return a valid path, when the application
+ // picks up a qt.conf file (which is the case for official Qt packages).
+ QCoreApplication app(argc, argv);
+ Q_UNUSED(app);
+
QTextStream out(stdout);
if (argc != 3) {