Skip to content
GitLab
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
beaff082
Commit
beaff082
authored
Nov 01, 2010
by
con
Browse files
Fix test compilation on Mac by using rpath.
parent
49b86e77
Changes
4
Hide whitespace changes
Inline
Side-by-side
tests/auto/cplusplus/shared/shared.pri
View file @
beaff082
...
...
@@ -3,5 +3,6 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/Nokia
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\"
tests/auto/qttest.pri
View file @
beaff082
...
...
@@ -11,13 +11,15 @@ symbian:{
RSS_RULES ="group_name=\"QtTests\";"
}
unix:
{
linux-*
{
QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/Nokia
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
} else:macx {
QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/../\"
}
# prefix test binary with tst_
...
...
tests/manual/process/process.pro
View file @
beaff082
...
...
@@ -11,7 +11,7 @@ QT += gui
include
(..
/../../
qtcreator
.
pri
)
#
--
Add
creator
'utils'
lib
macx
:
QMAKE_LFLAGS
+=
-
Wl
,
-
rpath
,
\
"$$IDE_BIN_PATH/..\"
LIBS
*=
-
l
$$
qtLibraryName
(
Utils
)
TARGET
=
process
...
...
tests/manual/ssh/ssh.pri
View file @
beaff082
include (../../../qtcreator.pri)
include (../../../src/plugins/coreplugin/coreplugin.pri)
macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
LIBS *= -L$$IDE_LIBRARY_PATH/Nokia
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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