From a8aa5c82197d0a28616d8cd5ce8a59dce797b65a Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 12 May 2009 16:18:38 +0200
Subject: [PATCH] Remove logic trying to guess whether it should be lib or
lib64.
Instead use qmake IDE_LIBRARY_BASENAME=lib64 to set it to lib64.
---
qtcreator.pri | 6 +++---
src/app/main.cpp | 6 +-----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index b2fe226d179..83ff7ceea1c 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -35,12 +35,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
}
}
-linux-*-64 {
- IDE_LIBRARY_BASENAME = lib64
-} else {
+isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib
}
+DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+
equals(TEST, 1) {
QT +=testlib
DEFINES += WITH_TESTS
diff --git a/src/app/main.cpp b/src/app/main.cpp
index eb403eebdf2..e1800de1f11 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -182,11 +182,7 @@ static inline QStringList getPluginPaths()
// 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath;
pluginPath += QDir::separator();
-#if defined(QT_ARCH_X86_64) && defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
- pluginPath += QLatin1String("lib64");
-#else
- pluginPath += QLatin1String("lib");
-#endif
+ pluginPath += QLatin1String(IDE_LIBRARY_BASENAME);
pluginPath += QDir::separator();
pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator();
--
GitLab