diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-10-19 15:22:37 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-19 15:22:37 +0200 |
commit | 80951d3e59f8b6ff270333692adfe2d65adf6c9c (patch) | |
tree | 8a5da6c06f7558d847e24dac386bb60775bd7d76 /src/plugins/qmlpreview/qmldebugtranslationwidget.h | |
parent | af0e135e7328d5672e54d08ba35765308e554f23 (diff) | |
parent | 436f111a4609462fcaae501b3d6d9b072adbb0b0 (diff) |
Merge remote-tracking branch 'origin/4.14' into master
Conflicts:
src/plugins/cppeditor/cppquickfix_test.cpp
Change-Id: Ib2984a3b3d9d071d11304b6cf132c2f8cef77e1c
Diffstat (limited to 'src/plugins/qmlpreview/qmldebugtranslationwidget.h')
-rw-r--r-- | src/plugins/qmlpreview/qmldebugtranslationwidget.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmlpreview/qmldebugtranslationwidget.h b/src/plugins/qmlpreview/qmldebugtranslationwidget.h index 7ea0760ac0..de0c7ba362 100644 --- a/src/plugins/qmlpreview/qmldebugtranslationwidget.h +++ b/src/plugins/qmlpreview/qmldebugtranslationwidget.h @@ -63,6 +63,9 @@ public: void setCurrentFile(const Utils::FilePath &filepath); void setFiles(const Utils::FilePaths &filePathes); void updateStartupProjectTranslations(); + + QColor warningColor(); + QColor foundTrColor(); private: void updateCurrentEditor(const Core::IEditor *editor); void updateCurrentTranslations(ProjectExplorer::Project *project); @@ -98,6 +101,10 @@ private: QHBoxLayout *m_selectLanguageLayout; TestLanguageGetter m_testLanguagesGetter; + QColor m_warningColor; + QColor m_foundTrColor; + QColor m_lastWarningColor; + QColor m_lastfoundTrColor; }; } // namespace QmlPreview |