diff options
| author | Eike Ziller <[email protected]> | 2019-05-08 12:41:25 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2019-05-08 12:41:25 +0200 |
| commit | 4545c81e570c477ae8821531dcfd593e09f950b0 (patch) | |
| tree | f756738ffaf55210a2aa1596407eeed94e504ae7 /src/plugins/qmakeprojectmanager/qmakeparsernodes.h | |
| parent | d0839bc1de52acd0902364565b6f9d030e591646 (diff) | |
| parent | 75e408584ac9a60c3a4dd714f5620814485fcdca (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
doc/src/howto/creator-sidebar-views.qdoc
doc/src/howto/creator-ui.qdoc
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/autotest/testresultmodel.cpp
src/plugins/autotest/testresultmodel.h
Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeparsernodes.h')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparsernodes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h index d166690badc..fb343cd07f1 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h @@ -372,6 +372,7 @@ private: QStringList m_featureRoots; std::unique_ptr<Utils::FileSystemWatcher> m_wildcardWatcher; + QMap<QString, QStringList> m_wildcardDirectoryContents; // Async stuff QFutureWatcher<Internal::QmakeEvalResult *> m_parseFutureWatcher; |