Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Hunger
qt-creator
Commits
aec1e262
Commit
aec1e262
authored
16 years ago
by
Daniel Molkentin
Browse files
Options
Downloads
Patches
Plain Diff
Fixes: Document rpath, fix resource targets on mac and linux
parent
5e7116e0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
share/share.pri
+81
-0
81 additions, 0 deletions
share/share.pri
src/rpath.pri
+1
-1
1 addition, 1 deletion
src/rpath.pri
with
82 additions
and
1 deletion
share/share.pri
0 → 100644
+
81
−
0
View file @
aec1e262
macx {
SNIPPETS.path = Contents/Resources
SNIPPETS.files = $$PWD/qtcreator/snippets
TEMPLATES.path = Contents/Resources
TEMPLATES.files = $$PWD/qtcreator/templates
DESIGNER.path = Contents/Resources
DESIGNER.files = $$PWD/qtcreator/designer
SCHEMES.path = Contents/Resources
SCHEMES.files = $$PWD/qtcreator/schemes
GDBDEBUGGER.path = Contents/Resources
GDBDEBUGGER.files = $$PWD/qtcreator/gdbmacros
LICENSE.path = Contents/Resources
LICENSE.files = $$PWD/qtcreator/license.txt
RUNINTERMINAL.path = Contents/Resources
RUNINTERMINAL.files = $$PWD/qtcreator/runInTerminal.command
QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER LICENSE RUNINTERMINAL
QMAKE_INFO_PLIST = $$PWD/qtcreator/info.plist
}
win32 {
# make sure the resources are in place
!exists($$OUT_PWD/app.pro) {
unix:SEPARATOR = ;
win32:SEPARATOR = &
# we are shadow build
COPYSRC = snippets \
templates \
designer \
schemes \
gdbmacros
COPYDEST = $${OUT_PWD}/../../bin
win32:COPYDEST ~= s|/+|\|
for(tmp,COPYSRC) {
REALSRC = $$PWD/$$tmp
REALDEST = $$COPYDEST/$$tmp
win32:tmp ~= s|/+|\|
win32:REALSRC ~= s|/+|\|
win32:REALDEST ~= s|/+|\|
QMAKE_POST_LINK += $${QMAKE_COPY_DIR} $${REALSRC} $${REALDEST} $$SEPARATOR
}
}
}
linux-* {
licenses.files += $$PWD/qtcreator/license.txt
licenses.path = /share/qtcreator
keymaps.files += $$PWD/qtcreator/schemes/MS_Visual_C++.kms
keymaps.files += $$PWD/qtcreator/schemes/Xcode.kms
keymaps.path = /share/qtcreator/schemes
gdbsupport.files += $$PWD/qtcreator/gdbmacros/GPL_EXCEPTION.TXT
gdbsupport.files += $$PWD/qtcreator/gdbmacros/gdbmacros.cpp
gdbsupport.files += $$PWD/qtcreator/gdbmacros/gdbmacros.pro
gdbsupport.path = /share/qtcreator/gdbmacros
designertemplates.files += $$PWD/qtcreator/designer/templates.xml
designertemplates.files += $$PWD/qtcreator/designer/templates/*
designertemplates.path = /share/qtcreator/designer/templates
snippets.files += $$PWD/qtcreator/snippets/*.snp
snippets.path = /share/qtcreator/snippets
projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget_form.h
projecttemplates.files += $$PWD/qtcreator/templates/qt4project/main.cpp
projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget.cpp
projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget.h
projecttemplates.files += $$PWD/qtcreator/templates/qt4project/widget.ui
projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget_form.cpp
projecttemplates.path = /share/qtcreator/templates/qt4project
INSTALLS += \
licenses \
keymaps \
gdbsupport \
designertemplates \
snippets \
projecttemplates
}
This diff is collapsed.
Click to expand it.
src/rpath.pri
+
1
−
1
View file @
aec1e262
macx {
macx {
# this is needed for the binary itself?
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
} else:linux-* {
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
#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/../lib/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment