diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-18 12:39:16 +0200 |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-18 12:39:16 +0200 |
| commit | 0b96a20f201dbd91599ee890f42dd8e452d15f79 (patch) | |
| tree | fbefbfe77e669f7d58a39c2be612a7098e6f7e17 /qmake/Makefile.win32 | |
| parent | 379073630202d37cf8e3927dc9745134ac2f5512 (diff) | |
| parent | 7a64a3f67d53a99e6e2200f6481c98013004b4e4 (diff) | |
| download | qt4-tools-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.gz | |
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')
| -rw-r--r-- | qmake/Makefile.win32 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 884e4c987c..2795d5d963 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -102,7 +102,7 @@ QTOBJS= \ qglobal.obj \ qhash.obj \ qiodevice.obj \ - qlistdata.obj \ + qlist.obj \ qlinkedlist.obj \ qlocale.obj \ qmalloc.obj \ @@ -153,7 +153,7 @@ clean:: -del qglobal.obj -del qhash.obj -del qiodevice.obj - -del qlistdata.obj + -del qlist.obj -del qlocale.obj -del qmalloc.obj -del qmap.obj @@ -283,8 +283,8 @@ quuid.obj: $(SOURCE_PATH)\src\corelib\plugin\quuid.cpp qbuffer.obj: $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp -qlistdata.obj: $(SOURCE_PATH)\src\corelib\tools\qlistdata.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlistdata.cpp +qlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlist.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlist.cpp qlinkedlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp |