Move version information in to separate file to decrease churn on svn up.
Fix inverted error message for Avahi.
This commit is contained in:
parent
5e9edd52fe
commit
2ad5acdd29
|
@ -854,6 +854,9 @@ list(APPEND OTHER_SOURCES
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
||||||
|
|
||||||
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/version.h)
|
||||||
|
|
||||||
qt4_wrap_cpp(MOC ${HEADERS})
|
qt4_wrap_cpp(MOC ${HEADERS})
|
||||||
qt4_wrap_ui(UIC ${UI})
|
qt4_wrap_ui(UIC ${UI})
|
||||||
qt4_add_resources(QRC ${RESOURCES})
|
qt4_add_resources(QRC ${RESOURCES})
|
||||||
|
|
|
@ -17,9 +17,6 @@
|
||||||
#ifndef CONFIG_H_IN
|
#ifndef CONFIG_H_IN
|
||||||
#define CONFIG_H_IN
|
#define CONFIG_H_IN
|
||||||
|
|
||||||
#define CLEMENTINE_VERSION_DISPLAY "${CLEMENTINE_VERSION_DISPLAY}"
|
|
||||||
#define CLEMENTINE_VERSION "${CLEMENTINE_VERSION_DEB}"
|
|
||||||
|
|
||||||
#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
|
#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
|
||||||
|
|
||||||
#cmakedefine ENABLE_WIIMOTEDEV
|
#cmakedefine ENABLE_WIIMOTEDEV
|
||||||
|
|
|
@ -45,6 +45,7 @@
|
||||||
#include "ui/iconloader.h"
|
#include "ui/iconloader.h"
|
||||||
#include "ui/mainwindow.h"
|
#include "ui/mainwindow.h"
|
||||||
#include "ui/systemtrayicon.h"
|
#include "ui/systemtrayicon.h"
|
||||||
|
#include "version.h"
|
||||||
#include "widgets/osd.h"
|
#include "widgets/osd.h"
|
||||||
|
|
||||||
#include "qtsingleapplication.h"
|
#include "qtsingleapplication.h"
|
||||||
|
|
|
@ -88,8 +88,8 @@ void Avahi::CommitFinished(QDBusPendingCallWatcher* call) {
|
||||||
call->deleteLater();
|
call->deleteLater();
|
||||||
|
|
||||||
if (call->isError()) {
|
if (call->isError()) {
|
||||||
qDebug() << "Remote interface published on Avahi";
|
|
||||||
} else {
|
|
||||||
qWarning() << "Failed to commit Avahi changes:" << call->error().message();
|
qWarning() << "Failed to commit Avahi changes:" << call->error().message();
|
||||||
|
} else {
|
||||||
|
qDebug() << "Remote interface published on Avahi";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,6 +78,7 @@
|
||||||
#include "ui/settingsdialog.h"
|
#include "ui/settingsdialog.h"
|
||||||
#include "ui/systemtrayicon.h"
|
#include "ui/systemtrayicon.h"
|
||||||
#include "ui/windows7thumbbar.h"
|
#include "ui/windows7thumbbar.h"
|
||||||
|
#include "version.h"
|
||||||
#include "widgets/errordialog.h"
|
#include "widgets/errordialog.h"
|
||||||
#include "widgets/fileview.h"
|
#include "widgets/fileview.h"
|
||||||
#include "widgets/multiloadingindicator.h"
|
#include "widgets/multiloadingindicator.h"
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
/* This file is part of Clementine.
|
||||||
|
|
||||||
|
Clementine is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
Clementine is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef VERSION_H_IN
|
||||||
|
#define VERSION_H_IN
|
||||||
|
|
||||||
|
#define CLEMENTINE_VERSION_DISPLAY "${CLEMENTINE_VERSION_DISPLAY}"
|
||||||
|
#define CLEMENTINE_VERSION "${CLEMENTINE_VERSION_DEB}"
|
||||||
|
|
||||||
|
#endif // VERSION_H_IN
|
Loading…
Reference in New Issue