summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager/qmakeproject.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2017-02-10 11:57:10 +0100
committerTobias Hunger <tobias.hunger@qt.io>2017-02-15 09:02:52 +0000
commit528b5f2298571c59f8cb6106e4ae74844d8fd334 (patch)
tree53df2929f9afab18653c5f696b48ddf77d572a42 /src/plugins/qmakeprojectmanager/qmakeproject.h
parent8c6021ef7e6ff3a6b20a99cd1c1498a83ee0c25d (diff)
downloadqt-creator-528b5f2298571c59f8cb6106e4ae74844d8fd334.tar.gz
qmake: Use enums from Qmake*File over those in Qmake*FileNode
Use QmakeParserProFileNode::AsyncUpdateDelay instead of QmakeParserProFileNode::AsyncUpdateDelay. Change-Id: I6628e566ce0f289778d61d146df58ca31345cdd7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeproject.h')
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeproject.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h
index 940de1644f..92feacfa44 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.h
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.h
@@ -100,7 +100,7 @@ public:
/// \internal
void scheduleAsyncUpdate(QmakeProjectManager::QmakeProFileNode *node,
- QmakeProFileNode::AsyncUpdateDelay delay = QmakeProFileNode::ParseLater);
+ QmakeParserProFileNode::AsyncUpdateDelay delay = QmakeParserProFileNode::ParseLater);
/// \internal
void incrementPendingEvaluateFutures();
/// \internal
@@ -143,7 +143,7 @@ signals:
void proFilesEvaluated();
public:
- void scheduleAsyncUpdate(QmakeProFileNode::AsyncUpdateDelay delay = QmakeProFileNode::ParseLater);
+ void scheduleAsyncUpdate(QmakeParserProFileNode::AsyncUpdateDelay delay = QmakeParserProFileNode::ParseLater);
void scheduleAsyncUpdateLater() { scheduleAsyncUpdate(); }
protected:
@@ -175,7 +175,7 @@ private:
ProjectExplorer::DeploymentData &deploymentData);
void collectLibraryData(const QmakeProFileNode *node,
ProjectExplorer::DeploymentData &deploymentData);
- void startAsyncTimer(QmakeProFileNode::AsyncUpdateDelay delay);
+ void startAsyncTimer(QmakeParserProFileNode::AsyncUpdateDelay delay);
bool matchesKit(const ProjectExplorer::Kit *kit);
void warnOnToolChainMismatch(const QmakeProFileNode *pro) const;