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
Marco Bubke
flatpak-qt-creator
Commits
c71edd77
Commit
c71edd77
authored
Feb 06, 2009
by
dt
Browse files
Fixes: Finding the ui*.h files so that we can parse those.
parent
dd9ccc51
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4nodes.cpp
View file @
c71edd77
...
...
@@ -540,7 +540,7 @@ Qt4ProFileNode::~Qt4ProFileNode()
void
Qt4ProFileNode
::
buildStateChanged
(
ProjectExplorer
::
Project
*
project
)
{
if
(
project
==
m_project
&&
!
ProjectExplorer
::
ProjectExplorerPlugin
::
instance
()
->
buildManager
()
->
isBuilding
(
m_project
))
updateUiFiles
();
updateUiFiles
(
m_project
->
buildDirectory
(
m_project
->
activeBuildConfiguration
())
);
}
bool
Qt4ProFileNode
::
hasTargets
()
const
...
...
@@ -710,7 +710,7 @@ void Qt4ProFileNode::update()
emit
qt4Watcher
->
variablesChanged
(
this
,
m_varValues
,
newVarValues
);
}
updateUiFiles
();
updateUiFiles
(
m_project
->
buildDirectory
(
m_project
->
activeBuildConfiguration
())
);
foreach
(
NodesWatcher
*
watcher
,
watchers
())
if
(
Qt4NodesWatcher
*
qt4Watcher
=
qobject_cast
<
Qt4NodesWatcher
*>
(
watcher
))
...
...
@@ -744,7 +744,7 @@ namespace {
// It does so by storing a modification time for each ui file we know about.
// TODO this function should also be called if the build directory is changed
void
Qt4ProFileNode
::
updateUiFiles
()
void
Qt4ProFileNode
::
updateUiFiles
(
const
QString
&
buildDirectory
)
{
// Only those two project types can have ui files for us
if
(
m_projectType
!=
ApplicationTemplate
...
...
@@ -757,7 +757,7 @@ void Qt4ProFileNode::updateUiFiles()
const
QList
<
FileNode
*>
uiFiles
=
uiFilesVisitor
.
uiFileNodes
;
// Find the UiDir, there can only ever be one
QString
uiDir
;
// We should default to the
build
d
irectory
QString
uiDir
=
build
D
irectory
;
QStringList
tmp
=
m_varValues
[
UiDirVar
];
if
(
tmp
.
size
()
!=
0
)
uiDir
=
tmp
.
first
();
...
...
src/plugins/qt4projectmanager/qt4nodes.h
View file @
c71edd77
...
...
@@ -187,7 +187,7 @@ public slots:
void
scheduleUpdate
();
void
update
();
private
slots
:
void
updateUiFiles
();
void
updateUiFiles
(
const
QString
&
buildConfiguration
);
void
buildStateChanged
(
ProjectExplorer
::
Project
*
);
private:
...
...
Write
Preview
Supports
Markdown
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