Skip to content
Snippets Groups Projects
Commit a8aa5c82 authored by dt's avatar dt
Browse files

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
No related branches found
No related tags found
No related merge requests found
...@@ -35,12 +35,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) { ...@@ -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
......
...@@ -182,11 +182,7 @@ static inline QStringList getPluginPaths() ...@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment