Don't use global static QIcon's, they crash Qt5 on exit

qgis · Apr 12, 2016 · ca0bf6f · ca0bf6f · nyalldawson · Apr 12, 2016
1 parent 0adae36
commit ca0bf6f
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 49 deletions.
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -202,8 +202,6 @@ const QIcon &QgsZipItem::iconZip()
   return icon;
 }
 
-QMap<QString, QIcon> QgsDataItem::mIconMap = QMap<QString, QIcon>();
-
 QgsAnimatedIcon * QgsDataItem::mPopulatingIcon = nullptr;
 
 QgsDataItem::QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, const QString& name, const QString& path )

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -247,7 +247,7 @@ class CORE_EXPORT QgsDataItem : public QObject
     QString mToolTip;
     QString mIconName;
     QIcon mIcon;
-    static QMap<QString, QIcon> mIconMap;
+    QMap<QString, QIcon> mIconMap;
 
   public slots:
     /** Safely delete the item:

diff --git a/src/gui/qgscollapsiblegroupbox.cpp b/src/gui/qgscollapsiblegroupbox.cpp
@@ -27,9 +27,6 @@
 #include <QSettings>
 #include <QScrollArea>
 
-QIcon QgsCollapsibleGroupBoxBasic::mCollapseIcon;
-QIcon QgsCollapsibleGroupBoxBasic::mExpandIcon;
-
 QgsCollapsibleGroupBoxBasic::QgsCollapsibleGroupBoxBasic( QWidget *parent )
     : QGroupBox( parent )
 {
@@ -65,11 +62,8 @@ void QgsCollapsibleGroupBoxBasic::init()
   mTitleClicked = false;
 
   // init icons
-  if ( mCollapseIcon.isNull() )
-  {
-    mCollapseIcon = QgsApplication::getThemeIcon( "/mIconCollapse.png" );
-    mExpandIcon = QgsApplication::getThemeIcon( "/mIconExpand.png" );
-  }
+  mCollapseIcon = QgsApplication::getThemeIcon( "/mIconCollapse.png" );
+  mExpandIcon = QgsApplication::getThemeIcon( "/mIconExpand.png" );
 
   // collapse button
   mCollapseButton = new QgsGroupBoxCollapseButton( this );

diff --git a/src/gui/qgscollapsiblegroupbox.h b/src/gui/qgscollapsiblegroupbox.h
@@ -159,8 +159,8 @@ class GUI_EXPORT QgsCollapsibleGroupBoxBasic : public QGroupBox
     bool mShiftDown;
     bool mTitleClicked;
 
-    static QIcon mCollapseIcon;
-    static QIcon mExpandIcon;
+    QIcon mCollapseIcon;
+    QIcon mExpandIcon;
 };
 
 /** \ingroup gui

diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -28,14 +28,6 @@
 #include <QPointer>
 #include <QGroupBox>
 
-
-QIcon QgsDataDefinedButton::mIconDataDefine;
-QIcon QgsDataDefinedButton::mIconDataDefineOn;
-QIcon QgsDataDefinedButton::mIconDataDefineError;
-QIcon QgsDataDefinedButton::mIconDataDefineExpression;
-QIcon QgsDataDefinedButton::mIconDataDefineExpressionOn;
-QIcon QgsDataDefinedButton::mIconDataDefineExpressionError;
-
 QgsDataDefinedButton::QgsDataDefinedButton( QWidget* parent,
     const QgsVectorLayer* vl,
     const QgsDataDefined* datadefined,

diff --git a/src/gui/qgsdatadefinedbutton.h b/src/gui/qgsdatadefinedbutton.h
@@ -370,12 +370,12 @@ class GUI_EXPORT QgsDataDefinedButton: public QToolButton
 
     QScopedPointer<QgsDataDefinedAssistant> mAssistant;
 
-    static QIcon mIconDataDefine;
-    static QIcon mIconDataDefineOn;
-    static QIcon mIconDataDefineError;
-    static QIcon mIconDataDefineExpression;
-    static QIcon mIconDataDefineExpressionOn;
-    static QIcon mIconDataDefineExpressionError;
+    QIcon mIconDataDefine;
+    QIcon mIconDataDefineOn;
+    QIcon mIconDataDefineError;
+    QIcon mIconDataDefineExpression;
+    QIcon mIconDataDefineExpressionOn;
+    QIcon mIconDataDefineExpressionError;
 
     ExpressionContextCallback mExpressionContextCallback;
     const void* mExpressionContextCallbackContext;

diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
@@ -240,25 +240,6 @@ int QgsFieldModel::columnCount( const QModelIndex &parent ) const
 
 QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
 {
-  static QIcon intIcon;
-  if ( intIcon.isNull() )
-    intIcon = QgsApplication::getThemeIcon( "/mIconFieldInteger.svg" );
-  static QIcon floatIcon;
-  if ( floatIcon.isNull() )
-    floatIcon = QgsApplication::getThemeIcon( "/mIconFieldFloat.svg" );
-  static QIcon stringIcon;
-  if ( stringIcon.isNull() )
-    stringIcon = QgsApplication::getThemeIcon( "/mIconFieldText.svg" );
-  static QIcon dateIcon;
-  if ( dateIcon.isNull() )
-    dateIcon = QgsApplication::getThemeIcon( "/mIconFieldDate.svg" );
-  static QIcon dateTimeIcon;
-  if ( dateTimeIcon.isNull() )
-    dateTimeIcon = QgsApplication::getThemeIcon( "/mIconFieldDateTime.svg" );
-  static QIcon timeIcon;
-  if ( timeIcon.isNull() )
-    timeIcon = QgsApplication::getThemeIcon( "/mIconFieldTime.svg" );
-
   if ( !index.isValid() )
     return QVariant();
 

diff --git a/src/gui/qgsvariableeditorwidget.cpp b/src/gui/qgsvariableeditorwidget.cpp
@@ -247,8 +247,6 @@ void QgsVariableEditorWidget::selectionChanged()
 // VariableEditorTree
 //
 
-QIcon QgsVariableEditorTree::mExpandIcon;
-
 QgsVariableEditorTree::QgsVariableEditorTree( QWidget *parent )
     : QTreeWidget( parent )
     , mEditorDelegate( nullptr )

diff --git a/src/gui/qgsvariableeditorwidget.h b/src/gui/qgsvariableeditorwidget.h
@@ -187,7 +187,7 @@ class QgsVariableEditorTree : public QTreeWidget
 
     QModelIndex moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers ) override;
 
-    static QIcon mExpandIcon;
+    QIcon mExpandIcon;
 
   private: