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
4a1acffb
Commit
4a1acffb
authored
16 years ago
by
Oswald Buddenhagen
Browse files
Options
Downloads
Patches
Plain Diff
install the wrapper script into both the builddir and the installdir
parent
c30420af
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
src/app/app.pro
+29
-17
29 additions, 17 deletions
src/app/app.pro
src/qworkbench.pri
+1
-0
1 addition, 0 deletions
src/qworkbench.pri
with
30 additions
and
17 deletions
src/app/app.pro
+
29
−
17
View file @
4a1acffb
...
@@ -3,22 +3,6 @@ IDE_BUILD_TREE = $$OUT_PWD/../../
...
@@ -3,22 +3,6 @@ IDE_BUILD_TREE = $$OUT_PWD/../../
include
(..
/
qworkbench
.
pri
)
include
(..
/
qworkbench
.
pri
)
include
(..
/
shared
/
qtsingleapplication
/
qtsingleapplication
.
pri
)
include
(..
/
shared
/
qtsingleapplication
/
qtsingleapplication
.
pri
)
macx
{
CONFIG
(
debug
,
debug
|
release
)
:
LIBS
*=
-
lExtensionSystem_debug
-
lAggregation_debug
else
:
LIBS
*=
-
lExtensionSystem
-
lAggregation
}
win32
{
CONFIG
(
debug
,
debug
|
release
)
:
LIBS
*=
-
lExtensionSystemd
-
lAggregationd
else
:
LIBS
*=
-
lExtensionSystem
-
lAggregation
}
unix
:
!
macx
{
LIBS
*=
-
lExtensionSystem
-
lAggregation
target
.
path
=
/
bin
INSTALLS
+=
target
}
TEMPLATE
=
app
TEMPLATE
=
app
TARGET
=
$$
IDE_APP_TARGET
TARGET
=
$$
IDE_APP_TARGET
DESTDIR
=
..
/../
bin
DESTDIR
=
..
/../
bin
...
@@ -36,5 +20,33 @@ macx {
...
@@ -36,5 +20,33 @@ macx {
ICON
=
qtcreator
.
icns
ICON
=
qtcreator
.
icns
}
}
include
(..
/../
share
/
share
.
pri
)
macx
{
CONFIG
(
debug
,
debug
|
release
)
:
LIBS
*=
-
lExtensionSystem_debug
-
lAggregation_debug
else
:
LIBS
*=
-
lExtensionSystem
-
lAggregation
}
win32
{
CONFIG
(
debug
,
debug
|
release
)
:
LIBS
*=
-
lExtensionSystemd
-
lAggregationd
else
:
LIBS
*=
-
lExtensionSystem
-
lAggregation
}
unix
:
!
macx
{
LIBS
*=
-
lExtensionSystem
-
lAggregation
#
make
sure
the
wrapper
is
in
place
!
exists
(
$$
OUT_PWD
/
app
.
pro
)
{
#
we
are
shadow
build
COPYSRC
=
$$
PWD
/
$$
DESTDIR
/
$$
IDE_APP_WRAPPER
COPYDEST
=
$$
OUT_PWD
/
$$
DESTDIR
/
$$
IDE_APP_WRAPPER
win32
:
COPYSRC
~=
s
|
/+
|
\
|
win32
:
COPYDEST
~=
s
|
/+
|
\
|
unix
:
SEPARATOR
=
;
win32
:
SEPARATOR
=
&
QMAKE_POST_LINK
+=
$$
{
QMAKE_COPY_FILE
}
$$
{
COPYSRC
}
$$
{
COPYDEST
}
$$
SEPARATOR
}
target
.
files
+=
$$
OUT_PWD
/
$$
DESTDIR
/
$$
IDE_APP_WRAPPER
target
.
path
=
/
bin
INSTALLS
+=
target
}
include
(..
/../
share
/
share
.
pri
)
This diff is collapsed.
Click to expand it.
src/qworkbench.pri
+
1
−
0
View file @
4a1acffb
...
@@ -26,6 +26,7 @@ macx {
...
@@ -26,6 +26,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
contains(QT_CONFIG, ppc):CONFIG += ppc x86
contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else {
} else {
IDE_APP_WRAPPER = qtcreator
IDE_APP_TARGET = qtcreator.bin
IDE_APP_TARGET = qtcreator.bin
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/
...
...
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