From a30fcd3f4e7fb6cecf56f656a10b7295c6b2420b Mon Sep 17 00:00:00 2001 From: my-tien Date: Wed, 28 Jan 2015 23:21:14 +0100 Subject: [PATCH] fixed #74 version bump in every file --- installer/knossos-nightly/DEBIAN/control | 2 +- installer/knossos/DEBIAN/control | 2 +- installer/knossos/opt/knossos/qt.conf | 2 ++ installer/knossos/usr/share/applications/knossos.desktop | 2 +- version.h.in | 2 +- widgets/mainwindow.cpp | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 installer/knossos/opt/knossos/qt.conf diff --git a/installer/knossos-nightly/DEBIAN/control b/installer/knossos-nightly/DEBIAN/control index 87357b785..fc492d06e 100644 --- a/installer/knossos-nightly/DEBIAN/control +++ b/installer/knossos-nightly/DEBIAN/control @@ -1,5 +1,5 @@ Package: knossos-nightly -Version: 4.1alpha +Version: 4.2alpha Section: misc Priority: extra Architecture: amd64 diff --git a/installer/knossos/DEBIAN/control b/installer/knossos/DEBIAN/control index 2516187c5..60af1d1ec 100644 --- a/installer/knossos/DEBIAN/control +++ b/installer/knossos/DEBIAN/control @@ -1,5 +1,5 @@ Package: knossos -Version: 4.0.1 +Version: 4.1 Section: misc Priority: extra Architecture: amd64 diff --git a/installer/knossos/opt/knossos/qt.conf b/installer/knossos/opt/knossos/qt.conf new file mode 100644 index 000000000..0544982d3 --- /dev/null +++ b/installer/knossos/opt/knossos/qt.conf @@ -0,0 +1,2 @@ +[PATHS] +Plugins=. \ No newline at end of file diff --git a/installer/knossos/usr/share/applications/knossos.desktop b/installer/knossos/usr/share/applications/knossos.desktop index 70a0d6c6e..11ab569b7 100644 --- a/installer/knossos/usr/share/applications/knossos.desktop +++ b/installer/knossos/usr/share/applications/knossos.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=KNOSSOS 4.0.1 +Name=KNOSSOS 4.1 Comment=3D image visualisation and annotation tool Exec=/opt/knossos/knossos Icon=/usr/share/pixmaps/knossos.png diff --git a/version.h.in b/version.h.in index e0e82a12e..99f7cca10 100644 --- a/version.h.in +++ b/version.h.in @@ -1,7 +1,7 @@ #ifndef VERSION_H #define VERSION_H -#define KVERSION "4.1 Alpha" +#define KVERSION "4.1" #define KREVISION "@KREVISION@" #endif//VERSION_H diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 1dfeda116..b696f1938 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -302,7 +302,7 @@ void MainWindow::notifyUnsavedChanges() { } void MainWindow::updateTitlebar() { - QString title = qApp->applicationDisplayName() + " (" + KREVISION + ")" + " showing "; + QString title = qApp->applicationDisplayName() + " showing "; if (!annotationFilename.isEmpty()) { title.append(annotationFilename); } else {