5 files changed, 18 insertions, 6 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) $<
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index e767786001..3efe6a67e0 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -118,8 +118,8 @@ QTOBJS= \
 	qmetatype.obj \
 	qxmlstream.obj \
 	qxmlutils.obj \
-	qnumeric.obj
-
+	qnumeric.obj \
+	qlogging.obj
 
 first all: qmake.exe
 
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 443dba390a..585061ed26 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -95,7 +95,8 @@ QTOBJS= \
 	qmetatype.o \
 	qxmlstream.o \
 	qxmlutils.o \
-	qnumeric.o
+	qnumeric.o \
+	qlogging.o
 
 
 qmake.exe: $(OBJS) $(QTOBJS)
@@ -339,3 +340,5 @@ 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
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
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 1f59531c42..ba6ab383c7 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -76,7 +76,8 @@ bootstrap { #Qt code
         qvector.cpp \
         qvsnprintf.cpp \
         qxmlstream.cpp \
-        qxmlutils.cpp
+        qxmlutils.cpp \
+        qlogging.cpp
 
    HEADERS+= \
         qbitarray.h \