diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 14:57:44 +0100 |
| commit | ef177a48f2c6c41549ef9d11a985ab2661942638 (patch) | |
| tree | d6bc5aa8cbde95d9e9857ead4b509e8b04b524b9 /examples/webengine/quicknanobrowser | |
| parent | 396ca081d7b0d9dab7de14ebaec7943c3f857a24 (diff) | |
| parent | e5bc5a6dbdd915e0b19cfc43e7af17e43c1a7878 (diff) | |
Merge branch '5.12' into dev
Conflicts:
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
Diffstat (limited to 'examples/webengine/quicknanobrowser')
| -rw-r--r-- | examples/webengine/quicknanobrowser/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index 63725d3e2..18ba7b3e2 100644 --- a/examples/webengine/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp @@ -78,6 +78,7 @@ static QUrl startupUrl() int main(int argc, char **argv) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); Application app(argc, argv); |