summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32-g++-sh
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-02-03 09:35:22 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-09 18:11:21 +0100
commitbe98fa32c7d56ea91359b647a329356fa44eca04 (patch)
tree7d3941bcfe07aebb95e74e7344c774f36eaccf17 /qmake/Makefile.win32-g++-sh
parente7e87993042ac9a4fd899da5ea0340322b47d9ff (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.win32-g++-sh')
-rw-r--r--qmake/Makefile.win32-g++-sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index bc8356e178..6dfb486375 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -95,7 +95,8 @@ QTOBJS= \
qmetatype.o \
qxmlstream.o \
qxmlutils.o \
- qnumeric.o
+ qnumeric.o \
+ qlogging.o
qmake.exe: $(OBJS) $(QTOBJS)
$(LINKQMAKE)
@@ -337,3 +338,6 @@ qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+
+qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp
+ $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlogging.cpp