feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove logic trying to guess whether it should be lib or lib64.

Browse Source 
Instead use qmake IDE_LIBRARY_BASENAME=lib64 to set it to lib64.
This commit is contained in:
dt
2009-05-12 16:18:38 +02:00
parent a6705ff8c5
commit a8aa5c8219
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qtcreator.pri
View File

@@ -35,12 +35,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
} }
} }
linux-*-64 { isEmpty(IDE_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib64
} else {
IDE_LIBRARY_BASENAME = lib IDE_LIBRARY_BASENAME = lib
} }
DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
equals(TEST, 1) { equals(TEST, 1) {
QT +=testlib QT +=testlib
DEFINES += WITH_TESTS DEFINES += WITH_TESTS

6
src/app/main.cpp
View File

@@ -182,11 +182,7 @@ static inline QStringList getPluginPaths()
// 1) "plugins" (Win/Linux) // 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath; QString pluginPath = rootDirPath;
pluginPath += QDir::separator(); pluginPath += QDir::separator();
#if defined(QT_ARCH_X86_64) && defined(Q_OS_UNIX) && !defined(Q_OS_MAC) pluginPath += QLatin1String(IDE_LIBRARY_BASENAME);
pluginPath += QLatin1String("lib64");
#else
pluginPath += QLatin1String("lib");
#endif
pluginPath += QDir::separator(); pluginPath += QDir::separator();
pluginPath += QLatin1String("qtcreator"); pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator(); pluginPath += QDir::separator();