diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-19 10:16:34 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-19 10:24:09 (GMT) |
| commit | 480f3df2eab9ad13e0d7ea1245158866a0b942bd (patch) | |
| tree | c920d15fab1133dc100828e9f1e18da8e6b059cc /qmake | |
| parent | 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7 (diff) | |
| download | Qt-480f3df2eab9ad13e0d7ea1245158866a0b942bd.zip Qt-480f3df2eab9ad13e0d7ea1245158866a0b942bd.tar.gz Qt-480f3df2eab9ad13e0d7ea1245158866a0b942bd.tar.bz2 | |
Fixed linkage failure when building qmake on Unix platforms
Commits f641369c/5254184c and 13cb80be/6ebcf2c2 caused registry.o
and epocroot.o respectively to be included twice during the
linkage step of qmake/Makefile.unix.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 5469134..fa98fd6 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -22,8 +22,6 @@ QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qgl qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \ qmap.o qmetatype.o qsettings.o qlibraryinfo.o qvariant.o qvsnprintf.o \ qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o qxmlstream.o qxmlutils.o \ - registry.o \ - epocroot.o \ $(QTOBJS) |