summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-02-19 10:16:34 (GMT)
committeraxis <qt-info@nokia.com>2010-02-23 08:23:37 (GMT)
commit8fcb0b6618610cb2ff947fc62f57abd33c8438b6 (patch)
tree594f4d9fe9289228fa100b92db7932b7b99e0816 /qmake/Makefile.win32
parent295e3dd7e07c7a1788e3dce4446eab9a608f99e6 (diff)
downloadQt-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/Makefile.win32')
0 files changed, 0 insertions, 0 deletions