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
e3885f28
Commit
e3885f28
authored
16 years ago
by
Oswald Buddenhagen
Browse files
Options
Downloads
Patches
Plain Diff
use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATH
IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
parent
97ffee6b
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
qtcreator.pri
+5
-3
5 additions, 3 deletions
qtcreator.pri
src/app/app.pro
+1
-1
1 addition, 1 deletion
src/app/app.pro
src/libs/utils/process_stub.pro
+2
-6
2 additions, 6 deletions
src/libs/utils/process_stub.pro
src/plugins/debugger/dumper.pro
+3
-1
3 additions, 1 deletion
src/plugins/debugger/dumper.pro
with
11 additions
and
11 deletions
qtcreator.pri
+
5
−
3
View file @
e3885f28
...
@@ -38,11 +38,13 @@ sub_dir = $$_PRO_FILE_PWD_
...
@@ -38,11 +38,13 @@ sub_dir = $$_PRO_FILE_PWD_
sub_dir ~= s,^$$re_escape($$PWD),,
sub_dir ~= s,^$$re_escape($$PWD),,
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
macx {
macx {
IDE_APP_TARGET = QtCreator
IDE_APP_TARGET = QtCreator
IDE_LIBRARY_PATH = $$IDE_
BUILD_TREE/bin
/$${IDE_APP_TARGET}.app/Contents/PlugIns
IDE_LIBRARY_PATH = $$IDE_
APP_PATH
/$${IDE_APP_TARGET}.app/Contents/PlugIns
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_DATA_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
contains(QT_CONFIG, ppc):CONFIG += ppc x86
contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else {
} else {
win32 {
win32 {
...
@@ -53,9 +55,9 @@ macx {
...
@@ -53,9 +55,9 @@ macx {
}
}
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
}
}
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
INCLUDEPATH += \
INCLUDEPATH += \
$$IDE_SOURCE_TREE/src/libs \
$$IDE_SOURCE_TREE/src/libs \
...
...
This diff is collapsed.
Click to expand it.
src/app/app.pro
+
1
−
1
View file @
e3885f28
...
@@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
...
@@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
TEMPLATE
=
app
TEMPLATE
=
app
TARGET
=
$$
IDE_APP_TARGET
TARGET
=
$$
IDE_APP_TARGET
DESTDIR
=
..
/../
bin
DESTDIR
=
$$
IDE_APP_PATH
SOURCES
+=
main
.
cpp
SOURCES
+=
main
.
cpp
...
...
This diff is collapsed.
Click to expand it.
src/libs/utils/process_stub.pro
+
2
−
6
View file @
e3885f28
...
@@ -2,11 +2,7 @@ include(../../../qtcreator.pri)
...
@@ -2,11 +2,7 @@ include(../../../qtcreator.pri)
TEMPLATE
=
app
TEMPLATE
=
app
TARGET
=
qtcreator_process_stub
TARGET
=
qtcreator_process_stub
macx
{
DESTDIR
=
$$
IDE_LIBEXEC_PATH
DESTDIR
=
$$
IDE_BUILD_TREE
/
bin
/
$$
{
IDE_APP_TARGET
}.
app
/
Contents
/
Resources
}
else
{
DESTDIR
=
..
/../../
bin
}
CONFIG
+=
warn_on
console
use_c_linker
CONFIG
+=
warn_on
console
use_c_linker
CONFIG
-=
qt
app_bundle
CONFIG
-=
qt
app_bundle
...
@@ -23,5 +19,5 @@ unix {
...
@@ -23,5 +19,5 @@ unix {
LIBS
+=
-
lshell32
LIBS
+=
-
lshell32
}
}
target
.
path
=
/
bin
target
.
path
=
/
bin
#
FIXME
:
libexec
,
more
or
less
INSTALLS
+=
target
INSTALLS
+=
target
This diff is collapsed.
Click to expand it.
src/plugins/debugger/dumper.pro
+
3
−
1
View file @
e3885f28
# This is a compile check for the dumpers only. Don't install the library!
include
(..
/../
qworkbenchlibrary
.
pri
)
include
(..
/../
qworkbenchlibrary
.
pri
)
TEMPLATE
=
lib
TEMPLATE
=
lib
TARGET
=
DebuggingHelper
TARGET
=
DebuggingHelper
CONFIG
+=
shared
CONFIG
+=
shared
DESTDIR
=
..
/../../
bin
DESTDIR
=
$$
IDE_LIBRARY_PATH
#
/
tmp
would
be
better
in
some
respect
...
linux
-*
{
linux
-*
{
CONFIG
-=
release
CONFIG
-=
release
...
...
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