diff options
author | kocsv <kocsv@local> | 2017-05-16 10:18:46 +0200 |
---|---|---|
committer | kocsv <kocsv@local> | 2017-05-16 10:18:46 +0200 |
commit | 82e4dc80f5838efcb08ac1c89f58a324b2a26409 (patch) | |
tree | f1f28bf0e1ad1fdcee4b2f87f34d9aa169080a5a /options | |
parent | aacc3bb2b563cd172e340365b8f14ec8fae32d9d (diff) | |
parent | a9ddb1242181032c549bcac7341e38cb2ee0bb73 (diff) |
Merge https://github.com/opentrack/opentrack into unstable
merge from upstream
Diffstat (limited to 'options')
-rw-r--r-- | options/tie.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/tie.hpp b/options/tie.hpp index 94fe5d49..16bf51d4 100644 --- a/options/tie.hpp +++ b/options/tie.hpp @@ -65,7 +65,7 @@ void tie_setting(value<t>& v, QLabel* lb, const QString& format, const xs&... ar template<typename t, typename F, typename... xs> decltype((void)((std::declval<F>())(std::declval<const t&>()))) -tie_setting(value<t>& v, QLabel* lb, F&& fun, const QString& fmt = QStringLiteral("%1"), const xs&... args) +tie_setting(value<t>& v, QLabel* lb, F&& fun, const QString& fmt, const xs&... args) { auto closure = [=](const t& x) { lb->setText(fmt.arg(fun(x), args...)); }; |