diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-18 14:44:21 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-18 14:44:21 (GMT) |
| commit | 3d6056dfe01116e34a2b47a70fb95e73753ef766 (patch) | |
| tree | ee4e1430dc9f0b06ab89091682d5a60525eac560 /qmake/Makefile.win32-g++ | |
| parent | 52e469a629d32b7f7e52518874dab13fcd4bb814 (diff) | |
| parent | 69689f3527f373618a1f4adad543b60afea46c17 (diff) | |
| download | Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.zip Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.tar.gz Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
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 c18201e..de25dae 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -69,7 +69,7 @@ QTOBJS= \ qhash.o \ qiodevice.o \ qlibraryinfo.o \ - qlistdata.o \ + qlist.o \ qlinkedlist.o \ qlocale.o \ qmalloc.o \ @@ -215,8 +215,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 |