diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-06-01 21:29:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 17:29:43 +0200 |
| commit | fe111148d811452f3c789a369c03e87164b137b9 (patch) | |
| tree | f559038cf196a38b5772ed8b59c56ec511315d77 /src | |
| parent | 8071101462df22b2c14f3b2b15c344fdf9fe9a54 (diff) | |
| download | qttools-fe111148d811452f3c789a369c03e87164b137b9.tar.gz | |
need no qlibraryinfo any more
we call qmake now
(cherry picked from commit 8f21f8aa75e4a64cdb89dbfd89663bcf5d58ab34)
Conflicts:
tools/linguist/lrelease/lrelease.pro
Change-Id: Iaa772dffd6a47c7ebfa093d5c4e578d3129fd5ac
Reviewed-on: http://codereview.qt-project.org/4614
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/linguist/lrelease/lrelease.pro | 2 | ||||
| -rw-r--r-- | src/linguist/lrelease/main.cpp | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro index 9d0cf1388..37d8de648 100644 --- a/src/linguist/lrelease/lrelease.pro +++ b/src/linguist/lrelease/lrelease.pro @@ -17,7 +17,5 @@ include(../shared/formats.pri) include(../shared/proparser.pri) include($$QT_SOURCE_TREE/tools/shared/symbian/epocroot.pri) -win32:LIBS += -ladvapi32 # for qsettings_win.cpp - target.path=$$[QT_INSTALL_BINS] INSTALLS += target diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp index 3f66013b0..aba314d80 100644 --- a/src/linguist/lrelease/main.cpp +++ b/src/linguist/lrelease/main.cpp @@ -426,16 +426,4 @@ static void initBinaryDir( #endif } -QT_BEGIN_NAMESPACE - -// The name is hard-coded in QLibraryInfo -QString qmake_libraryInfoFile() -{ - if (binDir.isEmpty()) - return QString(); - return QDir(binDir).filePath(QString::fromLatin1("qt.conf")); -} - -QT_END_NAMESPACE - #endif // QT_BOOTSTRAPPED |