Commit 29671581 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Solved build warning about the "About" name already taken

parent 08078da3
......@@ -34,13 +34,13 @@ public:
static About* instance();
protected:
virtual void changeEvent( QEvent *e );
virtual void changeEvent( QEvent *e );
private:
explicit About( QWidget *parent = 0 );
void setText( const QString& filename, QPlainTextEdit* widget );
Ui::About m_ui;
static About* m_instance;
explicit About( QWidget *parent = 0 );
void setText( const QString& filename, QPlainTextEdit* widget );
Ui::AboutVLMC m_ui;
static About* m_instance;
};
#endif // ABOUT_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>About</class>
<widget class="QDialog" name="About">
<class>AboutVLMC</class>
<widget class="QDialog" name="AboutVLMC">
<property name="geometry">
<rect>
<x>0</x>
......@@ -69,7 +69,7 @@ p, li { white-space: pre-wrap; }
</sizepolicy>
</property>
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<widget class="QWidget" name="About">
<attribute name="title">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment