From ccbda05dc163712d744fcff4ed2cf4fb59a3498b Mon Sep 17 00:00:00 2001 From: cfdev Date: Sun, 27 Jan 2013 10:34:30 +0000 Subject: [PATCH] Fix bug on categories reload, and add compilation's informations in about dialog. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2011 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/aboutqet.cpp | 5 +++++ sources/fileelementscollection.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sources/aboutqet.cpp b/sources/aboutqet.cpp index 2a55eb1ed..36c9d1b70 100644 --- a/sources/aboutqet.cpp +++ b/sources/aboutqet.cpp @@ -69,6 +69,11 @@ QWidget *AboutQET::title() const { icon -> setPixmap(QET::Icons::QETOxygenLogo.pixmap(48, 48)); // label "QElectroTech" QLabel *title = new QLabel("QElectroTech v" + QET::displayedVersion + ""); + QString sCompilation = "
"+ tr("Compilation: ") + __DATE__+ " " + __TIME__; +#ifdef __GNUC__ + sCompilation += " - GCC " + QString(__VERSION__); +#endif + title -> setText( title->text() + sCompilation); title -> setTextFormat(Qt::RichText); QHBoxLayout *hlayout = new QHBoxLayout(); diff --git a/sources/fileelementscollection.cpp b/sources/fileelementscollection.cpp index 2c38cc5af..465b4642b 100644 --- a/sources/fileelementscollection.cpp +++ b/sources/fileelementscollection.cpp @@ -89,7 +89,7 @@ void FileElementsCollection::setFilePath(const QString &path) { Supprime le contenu en memoire de cette collection */ void FileElementsCollection::deleteContent() { - delete root; + if(!root) delete root; root = 0; }