summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-04-27 07:12:14 (GMT)
committeraxis <qt-info@nokia.com>2009-04-27 07:12:14 (GMT)
commit001d46dffc6240da27634ef9e27b47f768587253 (patch)
treea6c26268335c3f9552e2e7a4c2fcaa5649a55512 /qmake
parentde6a89077241016da39ae5f9cbb696d6606a757d (diff)
parent04b8d70bb0965f868ffa78595c7afc99675e656e (diff)
downloadQt-001d46dffc6240da27634ef9e27b47f768587253.zip
Qt-001d46dffc6240da27634ef9e27b47f768587253.tar.gz
Qt-001d46dffc6240da27634ef9e27b47f768587253.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 6aa4f2b..c7f4dc4 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -46,7 +46,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \
generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \
- generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp
+ generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
$(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
$(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
$(SOURCE_PATH)/src/corelib/global/qmalloc.cpp \