diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:42:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:44:18 +0200 |
| commit | d8fc0da235b2bd566b2b6f1e21218afdf2f34eb3 (patch) | |
| tree | c0ca819521ed6901a83ab476fa822a886691d806 /src/corelib/global | |
| parent | 3649a6e61d823289d18be19387d7e3923dd90bd0 (diff) | |
| parent | cdf0c5905b3477c6cd01c519f883b7bb55447120 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
Change-Id: Ica85deeab5c5038ac004718e25194b1157343480
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 2 | ||||
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index ba84dd109e..17dd600265 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -279,11 +279,6 @@ #define QT_NO_DRAGANDDROP #endif -// QFileSystemModel -#if !defined(QT_NO_FILESYSTEMMODEL) && (defined(QT_NO_FILESYSTEMWATCHER)) -#define QT_NO_FILESYSTEMMODEL -#endif - // File Transfer Protocol #if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE)) #define QT_NO_FTP diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 814e95c256..ec54c7bdbf 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -202,7 +202,7 @@ SeeAlso: ??? Feature: FILESYSTEMMODEL Description: Provides a data model for the local filesystem. Section: File I/O -Requires: FILESYSTEMWATCHER +Requires: Name: QFileSystemModel SeeAlso: ??? diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index c0709ce258..694935b326 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -869,6 +869,7 @@ static void android_default_message_handler(QtMsgType type, { android_LogPriority priority; switch (type) { + case QtTraceMsg: case QtDebugMsg: priority = ANDROID_LOG_DEBUG; break; case QtWarningMsg: priority = ANDROID_LOG_WARN; break; case QtCriticalMsg: priority = ANDROID_LOG_ERROR; break; |