Author: jghali
Date: Mon Sep 20 19:40:00 2021
New Revision: 24708
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24708
Log:
#16637: Building with LTO causes segfaults on startup
Modified:
trunk/Scribus/scribus/ui/colorlistmodel.cpp
trunk/Scribus/scribus/ui/colorlistmodel.h
Modified: trunk/Scribus/scribus/ui/colorlistmodel.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24708&path=/trunk/Scribus/scribus/ui/colorlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.cpp Mon Sep 20 19:40:00 2021
@@ -30,8 +30,6 @@
m_color = col;
m_name = colName;
}
-
-ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr,
CommonStrings::None);
ColorListModel::ColorListModel(QObject *parent)
: QAbstractItemModel(parent)
Modified: trunk/Scribus/scribus/ui/colorlistmodel.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24708&path=/trunk/Scribus/scribus/ui/colorlistmodel.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.h (original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.h Mon Sep 20 19:40:00 2021
@@ -103,9 +103,6 @@
// SortRule m_sortRule
SortRule m_sortRule;
- //! Dummy object used to represent None Color
- static ColorPixmapValue m_NoneColor;
-
static bool compareColorNames(const ColorPixmapValue& v1, const
ColorPixmapValue& v2);
static bool compareColorValues(const ColorPixmapValue& v1, const
ColorPixmapValue& v2);
static bool compareColorTypes(const ColorPixmapValue& v1, const
ColorPixmapValue& v2);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
