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
8f586ced
Commit
8f586ced
authored
Dec 11, 2009
by
con
Browse files
Couldn't set "/usr/bin/qmake-4.6" or "/Developer/Tools/Qt/qmake" for Qt.
Task-number: QTCREATORBUG-463 Reviewed-by: dt
parent
bdde6283
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/debugginghelper.cpp
View file @
8f586ced
...
...
@@ -228,10 +228,6 @@ QString DebuggingHelperLibrary::buildDebuggingHelperLibrary(const QString &direc
QString
DebuggingHelperLibrary
::
qtVersionForQMake
(
const
QString
&
qmakePath
)
{
QString
binary
=
qmakePath
.
mid
(
qmakePath
.
lastIndexOf
(
'/'
)
+
1
);
if
(
!
possibleQMakeCommands
().
contains
(
binary
))
return
QString
();
QProcess
qmake
;
qmake
.
start
(
qmakePath
,
QStringList
(
QLatin1String
(
"--version"
)));
if
(
!
qmake
.
waitForFinished
())
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
8f586ced
...
...
@@ -889,8 +889,7 @@ void QtVersion::updateVersionInfo() const
m_hasDocumentation
=
false
;
QFileInfo
qmake
(
qmakeCommand
());
if
(
ProjectExplorer
::
DebuggingHelperLibrary
::
possibleQMakeCommands
().
contains
(
qmake
.
fileName
())
&&
qmake
.
exists
())
{
if
(
qmake
.
exists
()
&&
qmake
.
isExecutable
())
{
static
const
char
*
const
variables
[]
=
{
"QT_VERSION"
,
"QT_INSTALL_DATA"
,
...
...
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