Commit a8aa5c82 authored by dt's avatar dt

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

Instead use qmake IDE_LIBRARY_BASENAME=lib64 to set it to lib64.
parent a6705ff8
......@@ -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
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment