This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- qtdeclarative-opensource-src-5.15.2+dfsg.orig/src/quick/items/qquickflickable.cpp 2020-10-27 09:02:12.000000000 +0100 | |
+++ qtdeclarative-opensource-src-5.15.2+dfsg/src/quick/items/qquickflickable.cpp 2022-05-18 22:35:55.709434884 +0200 | |
@@ -62,6 +62,8 @@ | |
QT_BEGIN_NAMESPACE | |
Q_DECLARE_LOGGING_CATEGORY(lcHandlerParent) | |
+Q_LOGGING_CATEGORY(lcWheel, "qt.quick.flickable.wheel") | |
+Q_LOGGING_CATEGORY(lcVel, "qt.quick.flickable.velocity") | |
// FlickThreshold determines how far the "mouse" must have moved |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hello, China! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/ConversationModel.cpp b/src/core/ConversationModel.cpp | |
index 06969f7..fedccbb 100644 | |
--- a/src/core/ConversationModel.cpp | |
+++ b/src/core/ConversationModel.cpp | |
@@ -111,6 +111,9 @@ void ConversationModel::sendMessage(const QString &text) | |
message.status = Error; | |
message.identifier = id; | |
message.attemptCount++; | |
+ | |
+ // DEBUGGING ONLY: send identical message twice to test issue #515 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h | |
index e7b7053..54e3422 100644 | |
--- a/gtk/gtkfilechooserprivate.h | |
+++ b/gtk/gtkfilechooserprivate.h | |
@@ -32,10 +32,12 @@ | |
#include "gtktreestore.h" | |
#include "gtktreeview.h" | |
#include "gtkbox.h" | |
+#include "gtkiconview.h" | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c | |
index 1be1fd1..fa58d9f 100644 | |
--- a/gtk/gtkfilechooserdefault.c | |
+++ b/gtk/gtkfilechooserdefault.c | |
@@ -207,7 +207,8 @@ enum { | |
MODEL_COL_NAME_COLLATED, | |
MODEL_COL_IS_FOLDER, | |
MODEL_COL_IS_SENSITIVE, | |
- MODEL_COL_PIXBUF, | |
+ MODEL_COL_LIST_PIXBUF, |