Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
ae6dbf36
Commit
ae6dbf36
authored
Oct 29, 2010
by
hjk
Browse files
Revert "Qt4ProjectManager: correctly set parse state on restoring"
This reverts commit
b979d9f1
.
parent
722e48c2
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View file @
ae6dbf36
...
...
@@ -196,8 +196,6 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
SystemEnvironmentBase
).
toInt
());
m_remoteMounts
->
fromMap
(
map
);
m_validParse
=
qt4Target
()
->
qt4Project
()
->
validParse
(
m_proFilePath
);
setDefaultDisplayName
(
defaultDisplayName
());
return
true
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
ae6dbf36
...
...
@@ -237,9 +237,6 @@ bool S60DeviceRunConfiguration::fromMap(const QVariantMap &map)
return
false
;
if
(
!
QFileInfo
(
m_proFilePath
).
exists
())
return
false
;
m_validParse
=
qt4Target
()
->
qt4Project
()
->
validParse
(
m_proFilePath
);
setDefaultDisplayName
(
tr
(
"%1 on Symbian Device"
).
arg
(
QFileInfo
(
m_proFilePath
).
completeBaseName
()));
return
RunConfiguration
::
fromMap
(
map
);
...
...
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
View file @
ae6dbf36
...
...
@@ -179,9 +179,6 @@ bool S60EmulatorRunConfiguration::fromMap(const QVariantMap &map)
if
(
m_proFilePath
.
isEmpty
())
return
false
;
m_validParse
=
qt4Target
()
->
qt4Project
()
->
validParse
(
m_proFilePath
);
//: S60 emulator run configuration default display name, %1 is base pro-File name
setDefaultDisplayName
(
tr
(
"%1 in Symbian Emulator"
).
arg
(
QFileInfo
(
m_proFilePath
).
completeBaseName
()));
...
...
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View file @
ae6dbf36
...
...
@@ -530,8 +530,6 @@ bool Qt4RunConfiguration::fromMap(const QVariantMap &map)
m_userEnvironmentChanges
=
Utils
::
EnvironmentItem
::
fromStringList
(
map
.
value
(
QLatin1String
(
USER_ENVIRONMENT_CHANGES_KEY
)).
toStringList
());
m_baseEnvironmentBase
=
static_cast
<
BaseEnvironmentBase
>
(
map
.
value
(
QLatin1String
(
BASE_ENVIRONMENT_BASE_KEY
),
static_cast
<
int
>
(
Qt4RunConfiguration
::
BuildEnvironmentBase
)).
toInt
());
m_parseSuccess
=
qt4Target
()
->
qt4Project
()
->
validParse
(
m_proFilePath
);
return
RunConfiguration
::
fromMap
(
map
);
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment