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
ee92e82c
Commit
ee92e82c
authored
Oct 06, 2009
by
dt
Browse files
Fix bug with importanting a build with an not yet existing qt.
parent
26aca40a
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4project.cpp
View file @
ee92e82c
...
...
@@ -358,6 +358,7 @@ bool Qt4Project::restoreSettingsImpl(PersistentSettingsReader &settingsReader)
// Ensure that the qt version and tool chain in each build configuration is valid
// or if not, is reset to the default
foreach
(
BuildConfiguration
*
bc
,
buildConfigurations
())
{
qtVersionId
(
bc
);
toolChainType
(
bc
);
...
...
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View file @
ee92e82c
...
...
@@ -145,7 +145,7 @@ QString Qt4ProjectConfigWidget::displayName() const
void
Qt4ProjectConfigWidget
::
init
(
const
QString
&
buildConfiguration
)
{
if
(
debug
)
qDebug
()
<<
"Qt4ProjectConfigWidget::init()
"
;
qDebug
()
<<
"Qt4ProjectConfigWidget::init()
for"
<<
buildConfiguration
;
m_buildConfiguration
=
buildConfiguration
;
ProjectExplorer
::
BuildConfiguration
*
bc
=
m_pro
->
buildConfiguration
(
buildConfiguration
);
...
...
@@ -183,6 +183,7 @@ void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
m_ui
->
qtVersionComboBox
->
addItem
(
tr
(
"Default Qt Version (%1)"
).
arg
(
vm
->
defaultVersion
()
->
name
()),
0
);
int
qtVersionId
=
m_pro
->
qtVersionId
(
m_pro
->
buildConfiguration
(
m_buildConfiguration
));
if
(
qtVersionId
==
0
)
{
m_ui
->
qtVersionComboBox
->
setCurrentIndex
(
0
);
m_ui
->
invalidQtWarningLabel
->
setVisible
(
false
);
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
ee92e82c
...
...
@@ -159,6 +159,7 @@ QtVersionManager *QtVersionManager::instance()
void
QtVersionManager
::
addVersion
(
QtVersion
*
version
)
{
m_versions
.
append
(
version
);
m_uniqueIdToIndex
.
insert
(
version
->
uniqueId
(),
m_versions
.
count
()
-
1
);
emit
qtVersionsChanged
();
writeVersionsIntoSettings
();
}
...
...
@@ -823,6 +824,7 @@ void QtVersion::updateVersionInfo() const
{
if
(
m_versionInfoUpToDate
)
return
;
// extract data from qmake executable
m_versionInfo
.
clear
();
m_notInstalled
=
false
;
...
...
@@ -937,7 +939,7 @@ void QtVersion::updateMkSpec() const
mkspecPath
=
versionInfo
().
value
(
"QT_INSTALL_DATA"
)
+
"/mkspecs/default"
;
else
mkspecPath
=
mkspecPath
+
"/default"
;
//
qDebug() << "default mkspec is located at" << mkspecPath;
// qDebug() << "default mkspec is located at" << mkspecPath;
#ifdef Q_OS_WIN
QFile
f2
(
mkspecPath
+
"/qmake.conf"
);
if
(
f2
.
exists
()
&&
f2
.
open
(
QIODevice
::
ReadOnly
))
{
...
...
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