summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-27 09:00:05 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-27 09:00:05 (GMT)
commit137828d220a219fe0061afc56f2522e9e3d1ee79 (patch)
tree88ecd1e8c101c2ba19aea00075e3a123baf6a894 /tools
parentbc2b222148648354fe15a6f8da9e01743a1e3e3f (diff)
parent19d0a365dd99dc1a108e58949f7d0f49bac72623 (diff)
downloadQt-137828d220a219fe0061afc56f2522e9e3d1ee79.zip
Qt-137828d220a219fe0061afc56f2522e9e3d1ee79.tar.gz
Qt-137828d220a219fe0061afc56f2522e9e3d1ee79.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools')
-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)