Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
1cce35ec
Commit
1cce35ec
authored
Mar 18, 2011
by
Alessandro Portale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code deduplication.
The 'include(deployment.pri)' is now removed in a central place.
parent
dece4dcc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
+2
-0
src/plugins/qt4projectmanager/wizards/html5app.cpp
src/plugins/qt4projectmanager/wizards/html5app.cpp
+2
-4
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+0
-2
No files found.
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
View file @
1cce35ec
...
...
@@ -280,6 +280,8 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const
}
if
(
foldersCount
>
0
)
out
<<
"DEPLOYMENTFOLDERS = "
<<
folders
.
join
(
QLatin1String
(
" "
))
<<
endl
;
}
else
if
(
line
.
contains
(
QLatin1String
(
"# INCLUDE_DEPLOYMENT_PRI"
)))
{
in
.
readLine
();
// eats 'include(deployment.pri)'
}
else
{
handleCurrentProFileTemplateLine
(
line
,
in
,
out
,
commentOutNextLine
);
}
...
...
src/plugins/qt4projectmanager/wizards/html5app.cpp
View file @
1cce35ec
...
...
@@ -149,12 +149,10 @@ void Html5App::handleCurrentProFileTemplateLine(const QString &line,
QTextStream
&
proFileTemplate
,
QTextStream
&
proFile
,
bool
&
commentOutNextLine
)
const
{
Q_UNUSED
(
proFileTemplate
)
Q_UNUSED
(
proFile
)
if
(
line
.
contains
(
QLatin1String
(
"# INCLUDE_DEPLOYMENT_PRI"
)))
{
proFileTemplate
.
readLine
();
// eats 'include(deployment.pri)'
}
else
if
(
line
.
contains
(
QLatin1String
(
"# TOUCH_OPTIMIZED_NAVIGATION"
)))
{
if
(
line
.
contains
(
QLatin1String
(
"# TOUCH_OPTIMIZED_NAVIGATION"
)))
commentOutNextLine
=
!
m_touchOptimizedNavigationEnabled
;
}
}
#ifndef CREATORLESSTEST
...
...
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
View file @
1cce35ec
...
...
@@ -243,8 +243,6 @@ void QtQuickApp::handleCurrentProFileTemplateLine(const QString &line,
}
proFile
<<
endl
;
}
else
if
(
line
.
contains
(
QLatin1String
(
"# INCLUDE_DEPLOYMENT_PRI"
)))
{
proFileTemplate
.
readLine
();
// eats 'include(deployment.pri)'
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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