Update NEWS and Release note

Revert part of last commit about AUTHORS-SHORT in Windows....

svn path=/trunk/; revision=54577

diff --git a/NEWS b/NEWS
index 6281687e1551873cb268e84c00329161ec05b9de..9117f924ba778e1f2cc6a537db88c1c2f92bdd68 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ What's New
    The following features are new (or have been significantly updated)
    since version 1.11.2:
      * Qt port:
+          + The About dialog has been added
           + The Capture Interfaces dialog has been added.
           + The Decode As dialog has been added.
           + Several SCTP dialogs have been added.

diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 15694c66ac0cc03b752d6fb27333017639bdaeef..72aa2dc6c833ae210daedcce724d005194e9b139 100644 (file)
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -28,6 +28,7 @@ since version 1.11.2:
 
 * Qt port:
 
+** The About dialog has been added
 ** The Capture Interfaces dialog has been added.
 ** The Decode As dialog has been added.
 ** Several SCTP dialogs have been added.

diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index 5015d38f11ff17380105bd93442ed578898067e8..72e5eb89f3a7acbf97d2b9254aa3ac61f84fea4f 100644 (file)
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -150,12 +150,8 @@ AboutDialog::AboutDialog(QWidget *parent) :
 
 
     /* Authors */
-#if defined(_WIN32)
-    f_authors.setFileName(get_datafile_path("AUTHORS-SHORT.txt"));
-#else
-    f_authors.setFileName(get_datafile_path("AUTHORS-SHORT"));
-#endif
 
+    f_authors.setFileName(get_datafile_path("AUTHORS-SHORT"));
     f_authors.open(QFile::ReadOnly | QFile::Text);
     QTextStream ReadFile_authors(&f_authors);
 
@@ -249,11 +245,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
 
     /* License */
 
-    #if defined(_WIN32)
-        f_license.setFileName(get_datafile_path("COPYING.txt"));
-    #else
-        f_license.setFileName(get_datafile_path("COPYING"));
-    #endif
+#if defined(_WIN32)
+    f_license.setFileName(get_datafile_path("COPYING.txt"));
+#else
+    f_license.setFileName(get_datafile_path("COPYING"));
+#endif
 
     f_license.open(QFile::ReadOnly | QFile::Text);
     QTextStream ReadFile_license(&f_license);