diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-16 13:50:28 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-16 13:50:28 (GMT) |
| commit | 30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4 (patch) | |
| tree | 6b8adae6b69e3fdc5d6cdd65b79307229957d421 /qmake/Makefile.win32-g++ | |
| parent | 3e7c69afd0c69b2fffccf4e8cb6f292366f3217f (diff) | |
| parent | 53352584bbf81b577998b9f5a7dd2f7191870754 (diff) | |
| download | Qt-30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4.zip Qt-30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4.tar.gz Qt-30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4.tar.bz2 | |
Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into 13092010doc
Diffstat (limited to 'qmake/Makefile.win32-g++')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index e52b8c6..f313f9e 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -79,6 +79,7 @@ QTOBJS= \ qutfcodec.o \ qstring.o \ qstringlist.o \ + qsystemlibrary.o \ qtextstream.o \ quuid.o \ qvector.o \ @@ -234,6 +235,9 @@ qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp +qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp |