diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 23:14:22 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 23:14:22 +0200 |
commit | 6bc1ce9c164d0230508eafbe6c18144c8b1a6a74 (patch) | |
tree | e1e0fe8e15eb3b7ebfd90da9aeef0780f75c9700 /src/corelib/kernel/qcfsocketnotifier.cpp | |
parent | ccca3ffdc26f585f28ce0a8539f96f02adce30dc (diff) | |
parent | 3890988bb69c2a50d4ebdbcd8c4c7058ac364125 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/corelib/kernel/qcfsocketnotifier.cpp
src/tools/qdoc/qdocindexfiles.cpp
Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a
Diffstat (limited to 'src/corelib/kernel/qcfsocketnotifier.cpp')
-rw-r--r-- | src/corelib/kernel/qcfsocketnotifier.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcfsocketnotifier.cpp b/src/corelib/kernel/qcfsocketnotifier.cpp index 24e1e0ac9a..7f4c26d978 100644 --- a/src/corelib/kernel/qcfsocketnotifier.cpp +++ b/src/corelib/kernel/qcfsocketnotifier.cpp @@ -304,3 +304,4 @@ void QCFSocketNotifier::enableSocketNotifiers(CFRunLoopObserverRef ref, CFRunLoo } QT_END_NAMESPACE + |