diff options
| author | Frank Reininghaus <[email protected]> | 2014-10-24 18:49:05 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-10-24 18:49:05 +0200 |
| commit | fa988586bc923b33497cbc97aaac07fc93a4ca83 (patch) | |
| tree | 1232efe3052753b7f406f11fc1d84476b2282d96 /src/panels/terminal/terminalpanel.h | |
| parent | c07a97c4be1b5118026ea95831fd1edf7fac34e9 (diff) | |
| parent | 1f02d15f7ec13dd206698f88a92a9949cbfc3470 (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/panels/terminal/terminalpanel.cpp
dolphin/src/panels/terminal/terminalpanel.h
Diffstat (limited to 'src/panels/terminal/terminalpanel.h')
| -rw-r--r-- | src/panels/terminal/terminalpanel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h index 5d012a332..b3ccefb31 100644 --- a/src/panels/terminal/terminalpanel.h +++ b/src/panels/terminal/terminalpanel.h @@ -22,6 +22,8 @@ #include <panels/panel.h> +#include <QQueue> + class TerminalInterface; class QVBoxLayout; class QWidget; @@ -82,6 +84,7 @@ private: QWidget* m_terminalWidget; KParts::ReadOnlyPart* m_konsolePart; QString m_konsolePartCurrentDirectory; + QQueue<QString> m_sendCdToTerminalHistory; }; #endif // TERMINALPANEL_H |