From 8f21f8aa75e4a64cdb89dbfd89663bcf5d58ab34 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 1 Jun 2011 21:29:44 +0200
Subject: need no qlibraryinfo any more

we call qmake now
---
 tools/linguist/lrelease/lrelease.pro |  9 ---------
 tools/linguist/lrelease/main.cpp     | 12 ------------
 2 files changed, 21 deletions(-)

diff --git a/tools/linguist/lrelease/lrelease.pro b/tools/linguist/lrelease/lrelease.pro
index 89694be..e9b3a75 100644
--- a/tools/linguist/lrelease/lrelease.pro
+++ b/tools/linguist/lrelease/lrelease.pro
@@ -5,19 +5,10 @@ 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)
 include(../../shared/symbian/epocroot.pri)
 
-win32:LIBS += -ladvapi32   # for qsettings_win.cpp
-
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS        += target
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 9adaff5..1fa1474 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -425,16 +425,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
-- 
cgit v0.12