summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32-g++
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-18 10:39:16 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-18 10:39:16 (GMT)
commit0b96a20f201dbd91599ee890f42dd8e452d15f79 (patch)
treefbefbfe77e669f7d58a39c2be612a7098e6f7e17 /qmake/Makefile.win32-g++
parent379073630202d37cf8e3927dc9745134ac2f5512 (diff)
parent7a64a3f67d53a99e6e2200f6481c98013004b4e4 (diff)
downloadQt-0b96a20f201dbd91599ee890f42dd8e452d15f79.zip
Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.gz
Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts: src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
Diffstat (limited to 'qmake/Makefile.win32-g++')
-rw-r--r--qmake/Makefile.win32-g++6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index fe73dc8..644cd64 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -65,7 +65,7 @@ QTOBJS= \
qhash.o \
qiodevice.o \
qlibraryinfo.o \
- qlistdata.o \
+ qlist.o \
qlinkedlist.o \
qlocale.o \
qmalloc.o \
@@ -171,8 +171,8 @@ quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
-qlistdata.o: $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
- $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
+qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
+ $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
qlinkedlist.o: $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp