Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
e6779aae
Commit
e6779aae
authored
Apr 08, 2009
by
dt
Browse files
Use QT_INSTALL_DATA instead of path() for searching the debugger helper
parent
8261498c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View file @
e6779aae
...
...
@@ -171,9 +171,16 @@ QString CMakeManager::findQtDir(const ProjectExplorer::Environment &env)
QFileInfo
qmake
(
path
+
"/"
+
possibleCommand
);
if
(
qmake
.
exists
())
{
if
(
!
qtVersionForQMake
(
qmake
.
absoluteFilePath
()).
isNull
())
{
QDir
dir
(
qmake
.
absoluteDir
());
dir
.
cdUp
();
return
dir
.
absolutePath
();
QProcess
proc
;
proc
.
start
(
qmake
.
absoluteFilePath
(),
QStringList
()
<<
"-query"
<<
"QT_INSTALL_DATA"
);
if
(
proc
.
waitForFinished
())
{
return
proc
.
readAll
().
trimmed
();
}
else
{
proc
.
kill
();
QDir
dir
(
qmake
.
absoluteDir
());
dir
.
cdUp
();
return
dir
.
absolutePath
();
}
}
}
}
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
e6779aae
...
...
@@ -870,9 +870,12 @@ void QtVersion::setPath(const QString &path)
QString
QtVersion
::
dumperLibrary
()
const
{
uint
hash
=
qHash
(
path
());
QString
qtInstallData
=
versionInfo
().
value
(
"QT_INSTALL_DATA"
);
if
(
qtInstallData
.
isEmpty
())
qtInstallData
=
path
();
QStringList
directories
;
directories
<<
(
path
()
+
"/qtc-debugging-helper/"
)
<<
(
qtInstallData
+
"/qtc-debugging-helper/"
)
<<
(
QApplication
::
applicationDirPath
()
+
"/../qtc-debugging-helper/"
+
QString
::
number
(
hash
))
+
"/"
<<
(
QDesktopServices
::
storageLocation
(
QDesktopServices
::
DataLocation
)
+
"/qtc-debugging-helper/"
+
QString
::
number
(
hash
))
+
"/"
;
foreach
(
const
QString
&
directory
,
directories
)
{
...
...
@@ -1390,9 +1393,12 @@ QString QtVersion::buildDebuggingHelperLibrary()
QString
output
;
uint
hash
=
qHash
(
path
());
QString
qtInstallData
=
versionInfo
().
value
(
"QT_INSTALL_DATA"
);
if
(
qtInstallData
.
isEmpty
())
qtInstallData
=
path
();
QStringList
directories
;
directories
<<
path
()
+
"/qtc-debugging-helper/"
<<
qtInstallData
+
"/qtc-debugging-helper/"
<<
QApplication
::
applicationDirPath
()
+
"/../qtc-debugging-helper/"
+
QString
::
number
(
hash
)
+
"/"
<<
QDesktopServices
::
storageLocation
(
QDesktopServices
::
DataLocation
)
+
"/qtc-debugging-helper/"
+
QString
::
number
(
hash
)
+
"/"
;
...
...
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