Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flatpak-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
Marco Bubke
flatpak-qt-creator
Commits
e4768944
Commit
e4768944
authored
15 years ago
by
Oswald Buddenhagen
Browse files
Options
Downloads
Patches
Plain Diff
fix shadow build detection
parent
5562f71d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
qtcreator.pri
+2
-0
2 additions, 0 deletions
qtcreator.pri
qtcreator.pro
+2
-1
2 additions, 1 deletion
qtcreator.pro
share/qtcreator/static.pro
+1
-1
1 addition, 1 deletion
share/qtcreator/static.pro
with
5 additions
and
2 deletions
qtcreator.pri
+
2
−
0
View file @
e4768944
...
...
@@ -46,6 +46,7 @@ macx {
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
copydata = 1
} else {
win32 {
IDE_APP_TARGET = qtcreator
...
...
@@ -57,6 +58,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
!isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
}
INCLUDEPATH += \
...
...
This diff is collapsed.
Click to expand it.
qtcreator.pro
+
2
−
1
View file @
e4768944
...
...
@@ -4,10 +4,11 @@ contains(QT_VERSION, ^4\.[0-4]\..*) {
error
(
"Use at least Qt 4.5."
)
}
include
(
qtcreator
.
pri
)
include
(
doc
/
doc
.
pri
)
TEMPLATE
=
subdirs
CONFIG
+=
ordered
SUBDIRS
=
src
share
unix
:
!
macx
:
!
equals
(
_PRO_FILE_PWD_
,
$$
OUT_PWD
)
:
SUBDIRS
+=
bin
unix
:
!
macx
:
!
isEmpty
(
copydata
)
:
SUBDIRS
+=
bin
This diff is collapsed.
Click to expand it.
share/qtcreator/static.pro
+
1
−
1
View file @
e4768944
...
...
@@ -37,7 +37,7 @@ DATA_DIRS = \
schemes
\
gdbmacros
macx
|!
equals
(
_PRO_FILE_PWD_
,
$$
OUT_PWD
)
{
!
isEmpty
(
copydata
)
{
for
(
data_dir
,
DATA_DIRS
)
{
files
=
$$
files
(
$$
PWD
/
$$
data_dir
/*
.
*, true)
...
...
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