diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-19 10:16:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-23 08:23:37 (GMT) |
| commit | 8fcb0b6618610cb2ff947fc62f57abd33c8438b6 (patch) | |
| tree | 594f4d9fe9289228fa100b92db7932b7b99e0816 /qmake | |
| parent | 295e3dd7e07c7a1788e3dce4446eab9a608f99e6 (diff) | |
| download | Qt-8fcb0b6618610cb2ff947fc62f57abd33c8438b6.zip Qt-8fcb0b6618610cb2ff947fc62f57abd33c8438b6.tar.gz Qt-8fcb0b6618610cb2ff947fc62f57abd33c8438b6.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.
(cherry picked from commit 480f3df2eab9ad13e0d7ea1245158866a0b942bd)
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 94b34b7..54d52f2 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) |