diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 7 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 1 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++ | 4 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 4 | ||||
| -rw-r--r-- | qmake/qmake.pri | 2 |
5 files changed, 2 insertions, 16 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 9dbe035..93a211c 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -21,7 +21,7 @@ QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qgl 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 \ 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 \ + qlocale.o qlocale_tools.o qlocale_unix.o qlinkedlist.o qnumeric.o qcryptographichash.o \ qxmlstream.o qxmlutils.o \ $(QTOBJS) @@ -58,7 +58,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge $(SOURCE_PATH)/src/corelib/io/qdir.cpp $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \ $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp \ $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \ - $(SOURCE_PATH)/src/corelib/global/qconfig.cpp $(SOURCE_PATH)/src/corelib/io/qurl.cpp \ + $(SOURCE_PATH)/src/corelib/global/qconfig.cpp \ $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp \ $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp \ $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp \ @@ -147,9 +147,6 @@ qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp -qurl.o: $(SOURCE_PATH)/src/corelib/io/qurl.cpp - $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp - qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index d40000e..a15d19f 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -115,7 +115,6 @@ QTOBJS= \ qsettings.obj \ qlibraryinfo.obj \ qvariant.obj \ - qurl.obj \ qsettings_win.obj \ qmetatype.obj \ qxmlstream.obj \ diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 5fa1e5e..460dd88 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -89,7 +89,6 @@ QTOBJS= \ qtextstream.o \ quuid.o \ qvector.o \ - qurl.o \ qsettings.o \ qsettings_win.o \ qvariant.o \ @@ -130,9 +129,6 @@ qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp -qurl.o: $(SOURCE_PATH)/src/corelib/io/qurl.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp - qtextstream.o: $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index 49ccfbc..0c26251 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -89,7 +89,6 @@ QTOBJS= \ qtextstream.o \ quuid.o \ qvector.o \ - qurl.o \ qsettings.o \ qsettings_win.o \ qvariant.o \ @@ -129,9 +128,6 @@ qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp -qurl.o: $(SOURCE_PATH)/src/corelib/io/qurl.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp - qtextstream.o: $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp diff --git a/qmake/qmake.pri b/qmake/qmake.pri index f2a3705..31f67f4 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -82,7 +82,6 @@ bootstrap { #Qt code qstringlist.cpp \ qtemporaryfile.cpp \ qtextstream.cpp \ - qurl.cpp \ quuid.cpp \ qsettings.cpp \ qlibraryinfo.cpp \ @@ -127,7 +126,6 @@ bootstrap { #Qt code qsystemerror_p.h \ qtemporaryfile.h \ qtextstream.h \ - qurl.h \ quuid.h \ qvector.h \ qxmlstream.h \ |