Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
80468d99
Commit
80468d99
authored
Mar 23, 2009
by
hjk
Browse files
use 'lib64' instead of 'lib' on linux/x64_86
parent
380cb40f
Changes
6
Hide whitespace changes
Inline
Side-by-side
bin/qtcreator
View file @
80468d99
#!/bin/sh
bindir
=
$(
dirname
"
$0
"
)
libdir
=
$(
cd
${
bindir
}
/../lib
;
pwd
)
if
test
"
$(
uname
-m
)
"
=
"x86_64"
;
then
libdir
=
$(
cd
${
bindir
}
/../lib64
;
pwd
)
else
libdir
=
$(
cd
${
bindir
}
/../lib
;
pwd
)
fi
LD_LIBRARY_PATH
=
"
${
libdir
}
:
${
LD_LIBRARY_PATH
}
"
"
${
bindir
}
/qtcreator.bin"
${
1
+
"
$@
"
}
src/app/main.cpp
View file @
80468d99
...
...
@@ -179,7 +179,11 @@ static inline QStringList getPluginPaths()
// 1) "plugins" (Win/Linux)
QString
pluginPath
=
rootDirPath
;
pluginPath
+=
QDir
::
separator
();
#ifdef QT_ARCH_X86_64
pluginPath
+=
QLatin1String
(
"lib64"
);
#else
pluginPath
+=
QLatin1String
(
"lib"
);
#endif
pluginPath
+=
QDir
::
separator
();
pluginPath
+=
QLatin1String
(
"qtcreator"
);
pluginPath
+=
QDir
::
separator
();
...
...
src/qworkbench.pri
View file @
80468d99
...
...
@@ -6,6 +6,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
}
}
linux-g++-64 {
IDE_LIBRARY_BASENAME = lib64
} else {
IDE_LIBRARY_BASENAME = lib
}
equals(TEST, 1) {
QT +=testlib
DEFINES += WITH_TESTS
...
...
@@ -21,7 +27,7 @@ macx {
contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else {
IDE_APP_TARGET = qtcreator.bin
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/
lib
/qtcreator
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/
$$IDE_LIBRARY_BASENAME
/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins/
}
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
...
...
src/qworkbenchlibrary.pri
View file @
80468d99
...
...
@@ -14,6 +14,6 @@ TARGET = $$qtLibraryTarget($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
linux-* {
target.path = /
lib
/qtcreator
target.path = /
$$IDE_LIBRARY_BASENAME
/qtcreator
INSTALLS += target
}
}
src/qworkbenchplugin.pri
View file @
80468d99
...
...
@@ -17,7 +17,7 @@ isEmpty(TARGET) {
error("qworkbenchplugin.pri: You must provide a TARGET")
}
# Copy the pluginspec file to the lib
e
rary direct
y
ory.
# Copy the pluginspec file to the library directory.
# Note: On Windows/MinGW with some sh.exe in the path,
# QMAKE_COPY is some cp command that does not understand
# "\". Force the standard windows copy.
...
...
@@ -54,8 +54,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += plugin plugin_with_soname
linux-* {
target.path = /
lib
/qtcreator/plugins/$$PROVIDER
target.path = /
$$IDE_LIBRARY_BASENAME
/qtcreator/plugins/$$PROVIDER
pluginspec.files += $${TARGET}.pluginspec
pluginspec.path = /
lib
/qtcreator/plugins/$$PROVIDER
pluginspec.path = /
$$IDE_LIBRARY_BASENAME
/qtcreator/plugins/$$PROVIDER
INSTALLS += target pluginspec
}
src/rpath.pri
View file @
80468d99
...
...
@@ -3,7 +3,7 @@ macx {
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
QMAKE_RPATHDIR += \$\$ORIGIN/../
lib
/qtcreator
QMAKE_RPATHDIR += \$\$ORIGIN/../
$$IDE_LIBRARY_BASENAME
/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment