summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-11-09 10:34:33 +0100
committerLiang Qi <liang.qi@qt.io>2018-11-09 10:34:33 +0100
commitbc07958f922519bca1acc5930498ee0273576699 (patch)
treed5fda8e4458c2543458dbaeb7f4830c6d4750954 /src/corelib/kernel/qcoreapplication.cpp
parentb01a53fe328b37324c6e3ab38c50f156c93c6afe (diff)
parentdec7961709c90f6977d2447f7fa6c6625af41cb2 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: .qmake.conf qmake/Makefile.unix src/gui/text/qtextdocument.cpp src/gui/text/qtextdocument.h Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 463e30e1c3..3c8b0f947c 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -55,7 +55,6 @@
#include <qmutex.h>
#include <private/qloggingregistry_p.h>
#include <qstandardpaths.h>
-#include <qtextcodec.h>
#ifndef QT_NO_QOBJECT
#include <qthread.h>
#include <qthreadstorage.h>