File nomacs-qt5-build-fix.patch of Package nomacs

Overview Repositories Revisions Requests Users Attributes Meta

File nomacs-qt5-build-fix.patch of Package nomacs

--- a/src/DkDialog.cpp
+++ b/src/DkDialog.cpp
@@ -1809,11 +1809,10 @@
 	QItemDelegate::setEditorData(editor, index);
 }
 
-#if QT_VERSION < 0x050000
 void DkShortcutDelegate::textChanged(QString text) {
 	emit checkDuplicateSignal(text, item);
 }
-#else
+#if QT_VERSION >= 0x050000
 void DkShortcutDelegate::keySequenceChanged(const QKeySequence& keySequence) {
 	emit checkDuplicateSignal(keySequence, item);
 }
--- a/src/DkDialog.h
+++ b/src/DkDialog.h
@@ -410,9 +410,8 @@
 	void clearDuplicateSignal() const;
 
 protected slots:
-#if QT_VERSION < 0x050000
 	void textChanged(QString text = QString());
-#else
+#if QT_VERSION >= 0x050000
 	void keySequenceChanged(const QKeySequence& keySequence);
 #endif
 
--- a/src/DkUtils.h
+++ b/src/DkUtils.h
@@ -174,7 +174,7 @@
 	static void printMat(const cv::Mat src, const char* varName) {
 
 		if (src.depth() != CV_32FC1) {
-			//qDebug() << "I could not visualize the mat: " << QString::fromAscii(varName);
+			//qDebug() << "I could not visualize the mat: " << QString::fromLatin1(varName);
 			return;
 		}

Places

File nomacs-qt5-build-fix.patch of Package nomacs

Places