diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-02-03 09:35:22 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 18:11:21 +0100 |
| commit | be98fa32c7d56ea91359b647a329356fa44eca04 (patch) | |
| tree | 7d3941bcfe07aebb95e74e7344c774f36eaccf17 /qmake/Makefile.unix | |
| parent | e7e87993042ac9a4fd899da5ea0340322b47d9ff (diff) | |
Allow customization of qDebug output at runtime
Check the QT_OUTPUT_PATTERN environment variable in the default
message handler to customize the output of messages. Following
place holders are right now supported:
%{message}, %{type}, %{file}, %{line}, %{function}
The original cleanupFuncinfo was written by Thiago Macieira.
Change-Id: I6ad25baaa0e6a1c9f886105d2a93ef3310e512a9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'qmake/Makefile.unix')
| -rw-r--r-- | qmake/Makefile.unix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 286e2ebcbc..16af49311b 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -22,7 +22,7 @@ QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qgl qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \ qmap.o qmetatype.o qsettings.o qsystemerror.o qlibraryinfo.o qvariant.o qvsnprintf.o \ qlocale.o qlocale_tools.o qlocale_unix.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o \ - qxmlstream.o qxmlutils.o \ + qxmlstream.o qxmlutils.o qlogging.o \ $(QTOBJS) @@ -66,6 +66,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \ $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \ + $(SOURCE_PATH)/src/corelib/global/qlogging.cpp \ $(QTSRCS) CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \ @@ -316,6 +317,9 @@ qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp +qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlogging.cpp + #default rules .cpp.o: $(CXX) -c -o $@ $(CXXFLAGS) $< |