summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lrelease
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-24 10:11:27 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-24 10:11:27 (GMT)
commitac48a6c4f360631e83841be24113d7da495aae4b (patch)
treebb1ab479146a76823e3f3b82ac5581aa3da7ad64 /tools/linguist/lrelease
parent8759a330bd13174d79087fd16e4529ac44e4516f (diff)
downloadQt-ac48a6c4f360631e83841be24113d7da495aae4b.zip
Qt-ac48a6c4f360631e83841be24113d7da495aae4b.tar.gz
Qt-ac48a6c4f360631e83841be24113d7da495aae4b.tar.bz2
Fix build on AIX: all of the .a file is linked into the program.
The qlibraryinfo.cpp is only needed by lrelease. It has a hack for qmake_libraryInfoFile(), which doesn't work on AIX. So don't put qlibraryinfo.cpp in libbootstrap.a, but instead build directly for lrelease. Reviewed-by: thiago
Diffstat (limited to 'tools/linguist/lrelease')
-rw-r--r--tools/linguist/lrelease/lrelease.pro7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/linguist/lrelease/lrelease.pro b/tools/linguist/lrelease/lrelease.pro
index e4c18ee..b13c03e 100644
--- a/tools/linguist/lrelease/lrelease.pro
+++ b/tools/linguist/lrelease/lrelease.pro
@@ -5,6 +5,13 @@ DESTDIR = ../../../bin
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
SOURCES += main.cpp
+INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # qlibraryinfo.cpp includes qconfig.cpp
+SOURCES += \
+ $$QT_SOURCE_TREE/src/corelib/global/qlibraryinfo.cpp \
+ $$QT_SOURCE_TREE/src/corelib/io/qsettings.cpp
+win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp
+macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp
+
include(../../../src/tools/bootstrap/bootstrap.pri)
include(../shared/formats.pri)
include(../shared/proparser.pri)