summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-08-17 22:18:17 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-08-17 22:20:12 (GMT)
commit5bc376247a07a79be4a04bf33b44d4fd85a6ae97 (patch)
tree0d5c95b7d1c4882a730cf9596b64f3d0edbc179a
parentf844d3905e80194be7d56cbb631ae31ef36f29f8 (diff)
downloadQt-5bc376247a07a79be4a04bf33b44d4fd85a6ae97.zip
Qt-5bc376247a07a79be4a04bf33b44d4fd85a6ae97.tar.gz
Qt-5bc376247a07a79be4a04bf33b44d4fd85a6ae97.tar.bz2
Compile
After 843d2eed0ac10589a01d40bfdf88cb44c6a00b17 qmake didn't compile anymore. Reviewed-by: TrustMe
-rw-r--r--qmake/Makefile.unix8
-rw-r--r--qmake/Makefile.win328
-rw-r--r--qmake/Makefile.win32-g++6
-rw-r--r--qmake/Makefile.win32-g++-sh6
4 files changed, 14 insertions, 14 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index dcdc805..57d9fb2 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -13,7 +13,7 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \
#qt code
QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
- qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlistdata.o qfile.o \
+ qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist.o qfile.o \
qfsfileengine_unix.o qfsfileengine_iterator_unix.o qfsfileengine.o \
qfsfileengine_iterator.o qregexp.o qvector.o qbitarray.o qdir.o qdiriterator.o quuid.o qhash.o \
qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \
@@ -53,7 +53,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
$(SOURCE_PATH)/src/corelib/io/qdatastream.cpp $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \
$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \
$(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_unix.cpp $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \
- $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp \
+ $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \
$(SOURCE_PATH)/src/corelib/tools/qvector.cpp $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
$(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \
$(SOURCE_PATH)/src/corelib/io/qdir.cpp $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \
@@ -179,8 +179,8 @@ qdatastream.o: $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp
qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
-qlistdata.o: $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp
+qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfile.cpp
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 6340814..5ade431 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 \
@@ -191,7 +191,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
@@ -359,8 +359,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
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 9439f40..d7ee81d 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 \
@@ -209,8 +209,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
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index a0e981e..07302ea 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -65,7 +65,7 @@ QTOBJS= \
qhash.o \
qiodevice.o \
qlibraryinfo.o \
- qlistdata.o \
+ qlist.o \
qlinkedlist.o \
qlocale.o \
qmalloc.o \
@@ -208,8 +208,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