Merge remote-tracking branch 'refs/remotes/upstream/release/21.04'

36479979 · Julius Künzel · 4993dc1f · 5511f780 · 36479979
Commit 36479979 authored May 09, 2021 by Julius Künzel
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/dialogs/kdenlivesettingsdialog.cpp src/dialogs/kdenlivesettingsdialog.cpp +1 -1

No files found.
--- a/src/dialogs/kdenlivesettingsdialog.cpp
+++ b/src/dialogs/kdenlivesettingsdialog.cpp
@@ -119,7 +119,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a

    m_configMisc.kcfg_use_exiftool->setEnabled(!QStandardPaths::findExecutable(QStringLiteral("exiftool")).isEmpty());

-    QRegExp rx("(\\+|-)?\\d{2}:\\d{2}:\\d{2}:\\d{2}");
+    QRegExp rx(R"((\+|-)?\d{2}:\d{2}:\d{2}(:||,)\d{2})");
    QValidator *validator = new QRegExpValidator(rx, this);
    m_configMisc.kcfg_color_duration->setInputMask(pCore->timecode().mask());
    m_configMisc.kcfg_color_duration->setValidator(validator);