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
aa9329e7
Commit
aa9329e7
authored
Nov 10, 2009
by
dt
Browse files
More fixes for windows
parent
1a6f2793
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4project.cpp
View file @
aa9329e7
...
...
@@ -1014,11 +1014,15 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
if
(
index
>=
list
.
length
())
return
QString
();
QString
baseMkspecDir
=
version
->
versionInfo
().
value
(
"QMAKE_MKSPECS"
);
QString
baseMkspecDir
=
version
->
versionInfo
().
value
(
"QMAKE_MKSPECS"
);
if
(
baseMkspecDir
.
isEmpty
())
baseMkspecDir
=
version
->
versionInfo
().
value
(
"QT_INSTALL_DATA"
)
+
"/mkspecs"
;
QString
parsedSpec
=
QDir
::
cleanPath
(
list
.
at
(
index
));
#ifdef Q_OS_WIN
baseMkspecDir
=
baseMkspecDir
.
toLower
();
parsedSpec
=
parsedSpec
.
toLower
();
#endif
// if the path is relative it can be
// relative to the working directory (as found in the Makefiles)
// or relatively to the mkspec directory
...
...
@@ -1027,6 +1031,9 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
if
(
QFileInfo
(
parsedSpec
).
isRelative
())
{
if
(
QFileInfo
(
directory
+
"/"
+
parsedSpec
).
exists
())
{
parsedSpec
=
QDir
::
cleanPath
(
directory
+
"/"
+
parsedSpec
);
#ifdef Q_OS_WIN
parsedSpec
=
parsedSpec
.
toLower
();
#endif
}
else
{
parsedSpec
=
baseMkspecDir
+
"/"
+
parsedSpec
;
}
...
...
@@ -1043,7 +1050,7 @@ QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString
}
else
{
QString
sourceMkSpecPath
=
version
->
sourcePath
()
+
"/mkspecs"
;
if
(
parsedSpec
.
startsWith
(
sourceMkSpecPath
))
{
parsedSpec
=
sourceMkSpecPath
.
mid
(
sourceMkSpecPath
.
length
()
+
1
);
parsedSpec
=
parsedSpec
.
mid
(
sourceMkSpecPath
.
length
()
+
1
);
}
}
#ifdef Q_OS_WIN
...
...
@@ -1309,7 +1316,9 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(BuildConfiguration *confi
if
(
actualSpec
==
parsedSpec
)
return
true
;
// Actual spec is the default one
if
(
actualSpec
==
version
->
mkspec
()
&&
(
parsedSpec
==
"default"
||
parsedSpec
.
isEmpty
()))
qDebug
()
<<
"AS vs VS"
<<
actualSpec
<<
version
->
mkspec
();
if
((
actualSpec
==
version
->
mkspec
()
||
actualSpec
==
"default"
)
&&
(
parsedSpec
==
version
->
mkspec
()
||
parsedSpec
==
"default"
||
parsedSpec
.
isEmpty
()))
return
true
;
}
}
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
aa9329e7
...
...
@@ -1069,6 +1069,10 @@ void QtVersion::updateToolChainAndMkspec() const
if
(
baseMkspecDir
.
isEmpty
())
baseMkspecDir
=
versionInfo
().
value
(
"QT_INSTALL_DATA"
)
+
"/mkspecs"
;
#ifdef Q_OS_WIN
baseMkspecDir
=
baseMkspecDir
.
toLower
();
#endif
QString
mkspecFullPath
=
baseMkspecDir
+
"/default"
;
// qDebug() << "default mkspec is located at" << mkspecFullPath;
...
...
@@ -1123,7 +1127,7 @@ void QtVersion::updateToolChainAndMkspec() const
#endif
#ifdef Q_OS_WIN
m_
mkspecFullPath
=
m_
mkspecFullPath
.
toLower
();
mkspecFullPath
=
mkspecFullPath
.
toLower
();
#endif
m_mkspecFullPath
=
mkspecFullPath
;
...
...
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