diff options
author | Kai Koehne <kai.koehne@digia.com> | 2013-01-10 16:15:05 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 23:45:06 +0200 |
commit | 3efca77e35c0c336961f5e9640382ef87e83e794 (patch) | |
tree | 0b57aabfb4b3b4cf793f484fb555a09d91cde457 /src/corelib/io/io.pri | |
parent | 99f9bf9af68530302fcb5a920f477a224adc0e09 (diff) |
Import qlogger framework
Merge most parts of the qlogger framework from
git://gitorious.org/qtplayground/qlogger.git
The categorized logging feature is a replacement for qDebug, qWarning and
friends. With logging statements in an app/library, a developer can
turn on the statements they care about and turn off the ones they don't.
Most work for this was done by Wolfgang Beck and Lincoln Ramsay.
Task-number: QTBUG-25694
Change-Id: Ib0cdfbbf3694f86ad9ec553b2ea36f09a477cded
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/io.pri')
-rw-r--r-- | src/corelib/io/io.pri | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index c00947dd97..b7fc1bc600 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -49,7 +49,10 @@ HEADERS += \ io/qfilesystemmetadata_p.h \ io/qfilesystemiterator_p.h \ io/qfileselector.h \ - io/qfileselector_p.h + io/qfileselector_p.h \ + io/qloggingcategory.h \ + io/qloggingcategory_p.h \ + io/qloggingregistry_p.h SOURCES += \ io/qabstractfileengine.cpp \ @@ -86,7 +89,9 @@ SOURCES += \ io/qfilesystemwatcher_polling.cpp \ io/qfilesystementry.cpp \ io/qfilesystemengine.cpp \ - io/qfileselector.cpp + io/qfileselector.cpp \ + io/qloggingcategory.cpp \ + io/qloggingregistry.cpp win32 { SOURCES += io/qsettings_win.cpp |