diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-30 08:28:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-30 09:16:58 +0100 |
| commit | 87204c856ae3d8495c41af998ac196a12fe1c779 (patch) | |
| tree | 5af64eaa3acde506d19fe4ab1c88b028a2197adf /src/corelib/kernel | |
| parent | 498ef7f9d77fca75bcba2f657aaac38c8dc78aea (diff) | |
| parent | d0812cbdabcff4d388334c499c23992cce98d4da (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/thread/qsemaphore.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: Id35b535e88df63fdfe4007ea92ed4a39c4b6d707
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index d1640bdc49..a3342ecd5f 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -802,8 +802,6 @@ void QCoreApplicationPrivate::init() if (!coreappdata()->applicationVersionSet) coreappdata()->applicationVersion = appVersion(); - QLoggingRegistry::instance()->init(); - #if QT_CONFIG(library) // Reset the lib paths, so that they will be recomputed, taking the availability of argv[0] // into account. If necessary, recompute right away and replay the manual changes on top of the |