This commit is contained in:
parent
f6e5956811
commit
ae460d7f5b
@ -1,8 +1,8 @@
|
|||||||
Index: src/frontends/qt/GuiApplication.cpp
|
Index: src/frontends/qt4/GuiApplication.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/frontends/qt/GuiApplication.cpp (revision 5061db891c2b7b9ca96ca40a3ee90bd9b2c76392)
|
--- src/frontends/qt4/GuiApplication.cpp (revision dc5eda84b8bb4d4eed09047d1c55a33a8173e746)
|
||||||
+++ src/frontends/qt/GuiApplication.cpp (revision 222a317dd243fb18f01bfa6e994902fee06ae3db)
|
+++ src/frontends/qt4/GuiApplication.cpp (revision d418b6f4c8207cc84c7a3b890de5aec2c837a672)
|
||||||
@@ -1090,4 +1090,27 @@
|
@@ -1112,4 +1112,27 @@
|
||||||
|
|
||||||
|
|
||||||
+#if QT_VERSION < 0x050000
|
+#if QT_VERSION < 0x050000
|
||||||
@ -30,11 +30,11 @@ Index: src/frontends/qt/GuiApplication.cpp
|
|||||||
+
|
+
|
||||||
double GuiApplication::pixelRatio() const
|
double GuiApplication::pixelRatio() const
|
||||||
{
|
{
|
||||||
Index: src/frontends/qt/GuiApplication.h
|
Index: src/frontends/qt4/GuiApplication.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/frontends/qt/GuiApplication.h (revision 5061db891c2b7b9ca96ca40a3ee90bd9b2c76392)
|
--- src/frontends/qt4/GuiApplication.h (revision b9116e8b81f55ee795ea444ee02ff921bf82606a)
|
||||||
+++ src/frontends/qt/GuiApplication.h (revision 222a317dd243fb18f01bfa6e994902fee06ae3db)
|
+++ src/frontends/qt4/GuiApplication.h (revision d418b6f4c8207cc84c7a3b890de5aec2c837a672)
|
||||||
@@ -161,4 +161,9 @@
|
@@ -155,4 +155,9 @@
|
||||||
GuiView & view(int id) const;
|
GuiView & view(int id) const;
|
||||||
|
|
||||||
+#if (QT_VERSION < 0x050000)
|
+#if (QT_VERSION < 0x050000)
|
||||||
@ -44,11 +44,11 @@ Index: src/frontends/qt/GuiApplication.h
|
|||||||
+
|
+
|
||||||
/// Current ratio between physical pixels and device-independent pixels
|
/// Current ratio between physical pixels and device-independent pixels
|
||||||
double pixelRatio() const;
|
double pixelRatio() const;
|
||||||
Index: src/frontends/qt/GuiView.cpp
|
Index: src/frontends/qt4/GuiView.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/frontends/qt/GuiView.cpp (revision 21422dd6527754d8b7876a6e11b686cd726321ed)
|
--- src/frontends/qt4/GuiView.cpp (revision 1ae510b6287d5c96c3f106909c1cc8b0711b6d57)
|
||||||
+++ src/frontends/qt/GuiView.cpp (revision 222a317dd243fb18f01bfa6e994902fee06ae3db)
|
+++ src/frontends/qt4/GuiView.cpp (revision d418b6f4c8207cc84c7a3b890de5aec2c837a672)
|
||||||
@@ -817,10 +817,9 @@
|
@@ -751,10 +751,9 @@
|
||||||
settings.beginGroup("views");
|
settings.beginGroup("views");
|
||||||
settings.beginGroup(QString::number(id_));
|
settings.beginGroup(QString::number(id_));
|
||||||
-#if defined(Q_WS_X11) || defined(QPA_XCB)
|
-#if defined(Q_WS_X11) || defined(QPA_XCB)
|
||||||
@ -64,7 +64,7 @@ Index: src/frontends/qt/GuiView.cpp
|
|||||||
+ settings.setValue("geometry", saveGeometry());
|
+ settings.setValue("geometry", saveGeometry());
|
||||||
settings.setValue("layout", saveState(0));
|
settings.setValue("layout", saveState(0));
|
||||||
settings.setValue("icon_size", toqstr(d.iconSize(iconSize())));
|
settings.setValue("icon_size", toqstr(d.iconSize(iconSize())));
|
||||||
@@ -862,17 +861,18 @@
|
@@ -796,17 +795,18 @@
|
||||||
setIconSize(d.iconSize(settings.value(icon_key).toString()));
|
setIconSize(d.iconSize(settings.value(icon_key).toString()));
|
||||||
|
|
||||||
-#if defined(Q_WS_X11) || defined(QPA_XCB)
|
-#if defined(Q_WS_X11) || defined(QPA_XCB)
|
||||||
|
Loading…
Reference in New Issue
Block a user