[SCM] qastools/master: Imported Upstream version 0.20.0
sebholt-guest at users.alioth.debian.org
sebholt-guest at users.alioth.debian.org
Wed Apr 27 10:35:13 UTC 2016
The following commit has been merged in the master branch:
commit 94d87a5717209eb5e9c795dd2718f023029f7b1f
Author: Sebastian Holtermann <sebholt at xwmw.org>
Date: Wed Apr 27 12:31:25 2016 +0200
Imported Upstream version 0.20.0
diff --git a/CHANGELOG b/CHANGELOG
index a63bd5f..6ace573 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,23 @@
+2016-04-26 Sebastian Holtermann <sebholt at xwmw.org>
+ * all: Qt5 only. Qt4 support removed.
+ * all: Compile with C++11 (required)
+ * all: Compiler warning fixes
+ * all: Bug fixes
+ * Release version 0.20
+
+2014-12-09 Sebastian Holtermann <sebholt at xwmw.org>
+ * Release version 0.18.1
+
+2014-11-23 Sebastian Holtermann <sebholt at xwmw.org>
+ * all: Desktop files: "Categories" list extended with "Qt"
+ * all: Desktop files: "Keywords" list added
+ * all: Desktop files: Italian translation updated (submitted by Alexey Loginov)
+ * all: Desktop files: Russian translation updated (submitted by Alexey Loginov)
+
+2014-10-12 Sebastian Holtermann <sebholt at xwmw.org>
+ * all: Using NDEBUG for simple debugging removed
+ * all: Setting NDEBUG for compilation removed
+
2014-07-27 Sebastian Holtermann <sebholt at xwmw.org>
* Release version 0.18.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9146e8..b7645d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Default build type
@@ -42,7 +42,7 @@ ENDIF ( NOT PACKAGE_NAME )
# Package version
SET ( PACKAGE_VERSION_MAJOR "0" )
-SET ( PACKAGE_VERSION_MINOR "18" )
+SET ( PACKAGE_VERSION_MINOR "20" )
SET ( PACKAGE_VERSION_PATCH "0" )
SET ( PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}${VERSION_SUFFIX}" )
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
index 3926d47..e553881 100644
--- a/i18n/CMakeLists.txt
+++ b/i18n/CMakeLists.txt
@@ -1,16 +1,14 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Find modules
-SET ( QT_USE_QTCORE TRUE )
-FIND_PACKAGE ( Qt4 4.6 REQUIRED )
-INCLUDE ( ${QT_USE_FILE} )
+FIND_PACKAGE ( Qt5LinguistTools )
# Find translations source files
FILE ( GLOB ts_files "ts/*.ts" )
# Setup translations build target
-QT4_ADD_TRANSLATION ( qm_files ${ts_files} )
+QT5_ADD_TRANSLATION ( qm_files ${ts_files} )
ADD_CUSTOM_TARGET ( translations ALL DEPENDS ${qm_files} )
# Install translations
diff --git a/qasconfig/CMakeLists.txt b/qasconfig/CMakeLists.txt
index e2f0446..11cb230 100644
--- a/qasconfig/CMakeLists.txt
+++ b/qasconfig/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Program name
diff --git a/qasconfig/graphics/CMakeLists.txt b/qasconfig/graphics/CMakeLists.txt
index a9e0716..77bc44d 100644
--- a/qasconfig/graphics/CMakeLists.txt
+++ b/qasconfig/graphics/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Install application icons
diff --git a/qasconfig/share/CMakeLists.txt b/qasconfig/share/CMakeLists.txt
index 4cf3068..33d2c68 100644
--- a/qasconfig/share/CMakeLists.txt
+++ b/qasconfig/share/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Desktop file
diff --git a/qasconfig/share/application.desktop b/qasconfig/share/application.desktop
index 5b2b8b3..f00f6a6 100644
--- a/qasconfig/share/application.desktop
+++ b/qasconfig/share/application.desktop
@@ -4,13 +4,17 @@ Name=${PROGRAM_TITLE}
GenericName=ALSA configuration
GenericName[de]=ALSA-Konfiguration
GenericName[he]=תצורת ALSA
+GenericName[it]=Configurazione ALSA
+GenericName[ru]=Конфигурация ALSA
Exec=${PROGRAM_NAME}
Icon=${PROGRAM_NAME}
StartupNotify=false
Terminal=false
-Categories=AudioVideo;Audio;Mixer;
+Categories=AudioVideo;Audio;Mixer;Qt;
+Keywords=ALSA;Audio;Configuration;Qt;
Comment=ALSA configuration browser
Comment[cs]=Prohlížeč nastavení ALSA
Comment[de]=ALSA-Konfigurationsbetrachter
Comment[he]=סייר תצורת ALSA
+Comment[it]=Configuratore sistema ALSA
Comment[ru]=Просмотрщик конфигурации звуковой системы ALSA
diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt
index 1798b6c..5f9f8c7 100644
--- a/qasconfig/share/man/CMakeLists.txt
+++ b/qasconfig/share/man/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Find gzip
FIND_PACKAGE ( UnixCommands REQUIRED )
diff --git a/qasconfig/src/CMakeLists.txt b/qasconfig/src/CMakeLists.txt
index a91dd49..d1b5603 100644
--- a/qasconfig/src/CMakeLists.txt
+++ b/qasconfig/src/CMakeLists.txt
@@ -1,8 +1,14 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
-# Configure files
+# --- Find modules
+
+FIND_PACKAGE ( Qt5Widgets )
+FIND_PACKAGE ( ALSA REQUIRED )
+
+
+# --- Configure files
INCLUDE ( CheckIncludeFiles )
@@ -11,7 +17,7 @@ CONFIGURE_FILE (
${CMAKE_CURRENT_BINARY_DIR}/qastools_config.hpp )
-# Sources
+# --- Sources
SET ( SRC_GUI
${SHARED_SRC_DIR}/qsnd/alsa.cpp
@@ -50,32 +56,29 @@ SET ( SRC_GUI_HEADER_MOC
)
-ADD_DEFINITIONS ( "-Wextra -Wunused -Wall" )
+# --- Compiler flags
-SET ( CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG -fno-inline" )
-SET ( CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -Wl,--as-needed" )
+SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -Wextra -Wunused -Wall" )
+SET ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fno-inline" )
+SET ( CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}" )
+SET ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
-# Find modules
+# --- Include directories
-SET ( QT_USE_QTCORE TRUE )
-SET ( QT_USE_QTGUI TRUE )
-
-FIND_PACKAGE ( Qt4 4.6 REQUIRED )
-FIND_PACKAGE ( ALSA REQUIRED )
+INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} )
+INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES ( ${SHARED_INC_DIR} )
+INCLUDE_DIRECTORIES ( ${ALSA_INCLUDE_DIRS} )
-# QT stuff
+# --- QT extras
-INCLUDE ( ${QT_USE_FILE} )
+QT5_WRAP_CPP ( SRC_GUI_MOC ${SRC_GUI_HEADER_MOC} )
+QT5_WRAP_CPP ( SRC_EXTRA_MOC ${SRC_EXTRA_HEADER_MOC} )
-QT4_WRAP_CPP ( SRC_GUI_MOC ${SRC_GUI_HEADER_MOC} )
-QT4_WRAP_CPP ( SRC_EXTRA_MOC ${SRC_EXTRA_HEADER_MOC} )
-INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} )
-INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR} )
-INCLUDE_DIRECTORIES ( ${SHARED_INC_DIR} )
-INCLUDE_DIRECTORIES ( ${ALSA_INCLUDE_DIRS} )
+# --- Executable
ADD_EXECUTABLE ( ${PROGRAM_NAME}
${SRC_GUI}
@@ -83,12 +86,12 @@ ADD_EXECUTABLE ( ${PROGRAM_NAME}
)
TARGET_LINK_LIBRARIES ( ${PROGRAM_NAME}
- ${QT_LIBRARIES}
+ Qt5::Widgets
${ALSA_LIBRARIES}
)
-# Installation
+# --- Installation
INSTALL (
TARGETS ${PROGRAM_NAME} RUNTIME
diff --git a/qashctl/CMakeLists.txt b/qashctl/CMakeLists.txt
index 734f91d..80d595c 100644
--- a/qashctl/CMakeLists.txt
+++ b/qashctl/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Program name
diff --git a/qashctl/graphics/CMakeLists.txt b/qashctl/graphics/CMakeLists.txt
index a9e0716..77bc44d 100644
--- a/qashctl/graphics/CMakeLists.txt
+++ b/qashctl/graphics/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Install application icons
diff --git a/qashctl/share/CMakeLists.txt b/qashctl/share/CMakeLists.txt
index 4cf3068..33d2c68 100644
--- a/qashctl/share/CMakeLists.txt
+++ b/qashctl/share/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Desktop file
diff --git a/qashctl/share/application.desktop b/qashctl/share/application.desktop
index db5ff14..295972b 100644
--- a/qashctl/share/application.desktop
+++ b/qashctl/share/application.desktop
@@ -4,11 +4,16 @@ Name=${PROGRAM_TITLE}
GenericName=ALSA HCTL mixer
GenericName[de]=ALSA HCTL mixer
GenericName[he]=מערבל ALSA HCTL
+GenericName[it]=ALSA HCTL mixer
+GenericName[ru]=ALSA HCTL микшер
Exec=${PROGRAM_NAME}
Icon=${PROGRAM_NAME}
StartupNotify=false
Terminal=false
-Categories=AudioVideo;Audio;Mixer;
+Categories=AudioVideo;Audio;Mixer;Qt;
+Keywords=ALSA;Audio;Mixer;Qt;
Comment=ALSA HCTL mixer
Comment[de]=ALSA HCTL mixer
Comment[he]=מערבל ALSA HCTL
+Comment[it]=ALSA HCTL mixer
+Comment[ru]=ALSA HCTL микшер
diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt
index 3bad676..c14dfef 100644
--- a/qashctl/share/man/CMakeLists.txt
+++ b/qashctl/share/man/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Find gzip
FIND_PACKAGE ( UnixCommands REQUIRED )
diff --git a/qashctl/src/CMakeLists.txt b/qashctl/src/CMakeLists.txt
index 99ad6af..e4607d8 100644
--- a/qashctl/src/CMakeLists.txt
+++ b/qashctl/src/CMakeLists.txt
@@ -1,27 +1,27 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
-# Find modules
-SET ( QT_USE_QTCORE TRUE )
-SET ( QT_USE_QTGUI TRUE )
-SET ( QT_USE_QTSVG TRUE )
-FIND_PACKAGE ( Qt4 4.6 REQUIRED )
+# --- Find modules
+
+FIND_PACKAGE ( Qt5Widgets )
+FIND_PACKAGE ( Qt5Svg )
FIND_PACKAGE ( ALSA REQUIRED )
-INCLUDE ( ${QT_USE_FILE} )
# TODO: FIND_PACKAGE
SET ( UDEV_LIBRARIES udev )
-# Configure files
+# --- Configure files
+
INCLUDE ( CheckIncludeFiles )
CONFIGURE_FILE (
${SHARED_SRC_DIR}/qastools_config.hpp.cmake
${CMAKE_CURRENT_BINARY_DIR}/qastools_config.hpp )
-# Source files
+# --- Sources
+
SET ( SRC_GUI
${SHARED_SRC_DIR}/qsnd/alsa.cpp
${SHARED_SRC_DIR}/qsnd/alsa_config_watcher.cpp
@@ -210,34 +210,44 @@ SET ( SRC_GUI_HEADER_MOC
)
-# Compiler flags
-ADD_DEFINITIONS ( "-Wextra -Wunused -Wall" )
-SET ( CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG -fno-inline" )
-SET ( CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -Wl,--as-needed" )
+# --- Compiler flags
+SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -Wextra -Wunused -Wall" )
+SET ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fno-inline" )
+SET ( CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}" )
+SET ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
-# QT stuff
-QT4_WRAP_CPP ( SRC_GUI_MOC ${SRC_GUI_HEADER_MOC} )
-QT4_WRAP_CPP ( SRC_EXTRA_MOC ${SRC_EXTRA_HEADER_MOC} )
+
+# --- Include directories
INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} )
INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR} )
INCLUDE_DIRECTORIES ( ${SHARED_INC_DIR} )
INCLUDE_DIRECTORIES ( ${ALSA_INCLUDE_DIRS} )
+
+# --- QT extras
+
+QT5_WRAP_CPP ( SRC_GUI_MOC ${SRC_GUI_HEADER_MOC} )
+QT5_WRAP_CPP ( SRC_EXTRA_MOC ${SRC_EXTRA_HEADER_MOC} )
+
+
+# --- Executable
+
ADD_EXECUTABLE ( ${PROGRAM_NAME}
${SRC_GUI}
${SRC_GUI_MOC}
)
TARGET_LINK_LIBRARIES ( ${PROGRAM_NAME}
- ${QT_LIBRARIES}
+ Qt5::Widgets
+ Qt5::Svg
${ALSA_LIBRARIES}
${UDEV_LIBRARIES}
)
-# Installation
+# --- Installation
INSTALL (
TARGETS ${PROGRAM_NAME} RUNTIME
diff --git a/qashctl/src/mwdg/mixer_hctl.cpp b/qashctl/src/mwdg/mixer_hctl.cpp
index 630d792..b1e3d72 100644
--- a/qashctl/src/mwdg/mixer_hctl.cpp
+++ b/qashctl/src/mwdg/mixer_hctl.cpp
@@ -144,7 +144,7 @@ _editor_pad ( 0 )
// Item alignment
{
const Qt::Alignment align_cc ( Qt::AlignHCenter | Qt::AlignVCenter );
- const Qt::Alignment align_lc ( Qt::AlignLeft | Qt::AlignVCenter );
+ //const Qt::Alignment align_lc ( Qt::AlignLeft | Qt::AlignVCenter );
_info_lbl_index.value.setAlignment ( align_cc );
_info_lbl_dev.value.setAlignment ( align_cc );
_info_lbl_flags.value.setAlignment ( align_cc );
diff --git a/qashctl/src/mwdg/mixer_hctl_edit_bool.cpp b/qashctl/src/mwdg/mixer_hctl_edit_bool.cpp
index 458820f..a7fd635 100644
--- a/qashctl/src/mwdg/mixer_hctl_edit_bool.cpp
+++ b/qashctl/src/mwdg/mixer_hctl_edit_bool.cpp
@@ -165,7 +165,7 @@ Mixer_HCTL_Edit_Bool::setup_multi ( )
QGridLayout * lay_grid ( new QGridLayout );
lay_grid->setContentsMargins ( 0, 0, 0, 0 );
- const Qt::Alignment align_rc ( Qt::AlignRight | Qt::AlignVCenter );
+ //const Qt::Alignment align_rc ( Qt::AlignRight | Qt::AlignVCenter );
const Qt::Alignment align_cc ( Qt::AlignHCenter | Qt::AlignVCenter );
const QString val ( "%1" );
diff --git a/qashctl/src/mwdg/mixer_hctl_edit_enum.cpp b/qashctl/src/mwdg/mixer_hctl_edit_enum.cpp
index e5fb073..5c8173a 100644
--- a/qashctl/src/mwdg/mixer_hctl_edit_enum.cpp
+++ b/qashctl/src/mwdg/mixer_hctl_edit_enum.cpp
@@ -175,7 +175,7 @@ Mixer_HCTL_Edit_Enum::setup_multi ( )
QStringList item_names;
- const Qt::Alignment align_rc ( Qt::AlignRight | Qt::AlignVCenter );
+ //const Qt::Alignment align_rc ( Qt::AlignRight | Qt::AlignVCenter );
const Qt::Alignment align_cc ( Qt::AlignHCenter | Qt::AlignVCenter );
const QString val ( "%1" );
diff --git a/qashctl/src/mwdg/mixer_hctl_edit_int.cpp b/qashctl/src/mwdg/mixer_hctl_edit_int.cpp
index 5deeabc..2ec4b92 100644
--- a/qashctl/src/mwdg/mixer_hctl_edit_int.cpp
+++ b/qashctl/src/mwdg/mixer_hctl_edit_int.cpp
@@ -320,7 +320,7 @@ Mixer_HCTL_Edit_Int::create_range_label ( )
lbl_dB_range->setText ( _str_dB_range );
const Qt::Alignment align_cc ( Qt::AlignHCenter | Qt::AlignVCenter );
- const Qt::Alignment align_lc ( Qt::AlignLeft | Qt::AlignVCenter );
+ //const Qt::Alignment align_lc ( Qt::AlignLeft | Qt::AlignVCenter );
{
{
diff --git a/qasmixer/CMakeLists.txt b/qasmixer/CMakeLists.txt
index 4573849..2242d2e 100644
--- a/qasmixer/CMakeLists.txt
+++ b/qasmixer/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Program name
diff --git a/qasmixer/graphics/CMakeLists.txt b/qasmixer/graphics/CMakeLists.txt
index e074231..7a8609c 100644
--- a/qasmixer/graphics/CMakeLists.txt
+++ b/qasmixer/graphics/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Install application icons
diff --git a/qasmixer/share/CMakeLists.txt b/qasmixer/share/CMakeLists.txt
index 4cf3068..33d2c68 100644
--- a/qasmixer/share/CMakeLists.txt
+++ b/qasmixer/share/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Desktop file
diff --git a/qasmixer/share/application.desktop b/qasmixer/share/application.desktop
index 194cf51..546e79b 100644
--- a/qasmixer/share/application.desktop
+++ b/qasmixer/share/application.desktop
@@ -4,14 +4,18 @@ Name=${PROGRAM_TITLE}
GenericName=Sound volume mixer
GenericName[de]=Klanglautstärkenregler
GenericName[he]=מערבל צלילי עוצמת שמע
+GenericName[it]=Mixer volume audio
+GenericName[ru]=Микшер для звуковой системы
Exec=${PROGRAM_NAME}
Icon=${PROGRAM_NAME}
StartupNotify=false
Terminal=false
-Categories=AudioVideo;Audio;Mixer;
+Categories=AudioVideo;Audio;Mixer;Qt;
+Keywords=ALSA;Audio;Mixer;Qt;
Comment=Graphical mixer application for the ALSA
Comment[cs]=Grafický směšovač pro ALSA
Comment[de]=Graphische Mixeranwendung für ALSA
Comment[es]=Mezclador gráfico para ALSA
Comment[he]=יישום מערבל גרפי עבור ALSA
+Comment[it]=Mixer grafico per ALSA
Comment[ru]=Графический микшер для звуковой системы ALSA
diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt
index a1df711..f62381c 100644
--- a/qasmixer/share/man/CMakeLists.txt
+++ b/qasmixer/share/man/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Find gzip
FIND_PACKAGE ( UnixCommands REQUIRED )
diff --git a/qasmixer/src/CMakeLists.txt b/qasmixer/src/CMakeLists.txt
index 14d94fe..a55ee8e 100644
--- a/qasmixer/src/CMakeLists.txt
+++ b/qasmixer/src/CMakeLists.txt
@@ -1,33 +1,28 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
-# Find modules
-SET ( QT_USE_QTCORE TRUE )
-SET ( QT_USE_QTGUI TRUE )
-SET ( QT_USE_QTSVG TRUE )
-SET ( QT_USE_QTNETWORK TRUE )
-FIND_PACKAGE ( Qt4 4.6 REQUIRED )
+# --- Find modules
+
+FIND_PACKAGE ( Qt5Core REQUIRED )
+FIND_PACKAGE ( Qt5Widgets REQUIRED )
+FIND_PACKAGE ( Qt5Svg REQUIRED )
+FIND_PACKAGE ( Qt5Network REQUIRED )
FIND_PACKAGE ( ALSA REQUIRED )
-INCLUDE ( ${QT_USE_FILE} )
# TODO: FIND_PACKAGE
SET ( UDEV_LIBRARIES udev )
-# Configure files
+
+# --- Configure files
+
INCLUDE ( CheckIncludeFiles )
CONFIGURE_FILE (
${SHARED_SRC_DIR}/qastools_config.hpp.cmake
${CMAKE_CURRENT_BINARY_DIR}/qastools_config.hpp )
-# Compiler flags
-ADD_DEFINITIONS ( "-Wextra -Wunused -Wall" )
-SET ( CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG -fno-inline" )
-SET ( CMAKE_CXX_FLAGS_RELEASE "-O2 -s -DNDEBUG -Wl,--as-needed" )
-
-
-# Sources
+# --- Sources
SET ( SRC_GUI
@@ -242,32 +237,44 @@ SET ( SRC_GUI_HEADER_MOC
)
-# Qt stuff
-QT4_WRAP_CPP ( SRC_GUI_MOC ${SRC_GUI_HEADER_MOC} )
-QT4_WRAP_CPP ( SRC_EXTRA_MOC ${SRC_EXTRA_HEADER_MOC} )
+# --- Compiler flags
+
+SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -Wextra -Wunused -Wall" )
+SET ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fno-inline" )
+SET ( CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}" )
+SET ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
+
+# --- Include directories
-# Program
INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} )
INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR} )
INCLUDE_DIRECTORIES ( ${SHARED_INC_DIR} )
INCLUDE_DIRECTORIES ( ${ALSA_INCLUDE_DIRS} )
-ADD_EXECUTABLE (
- ${PROGRAM_NAME}
+
+# --- QT extras
+
+QT5_WRAP_CPP ( SRC_GUI_MOC ${SRC_GUI_HEADER_MOC} )
+QT5_WRAP_CPP ( SRC_EXTRA_MOC ${SRC_EXTRA_HEADER_MOC} )
+
+
+# --- Executable
+
+ADD_EXECUTABLE ( ${PROGRAM_NAME}
${SRC_GUI}
${SRC_GUI_MOC}
)
-
-TARGET_LINK_LIBRARIES (
- ${PROGRAM_NAME}
- ${QT_LIBRARIES}
+TARGET_LINK_LIBRARIES ( ${PROGRAM_NAME}
+ Qt5::Widgets
+ Qt5::Svg
+ Qt5::Network
${ALSA_LIBRARIES}
${UDEV_LIBRARIES}
)
-# Target installation
+# --- Installation
INSTALL (
TARGETS ${PROGRAM_NAME} RUNTIME
diff --git a/qastools.cbp b/qastools.cbp
deleted file mode 100644
index 0c2dacc..0000000
--- a/qastools.cbp
+++ /dev/null
@@ -1,434 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
- <FileVersion major="1" minor="6" />
- <Project>
- <Option title="qastools" />
- <Option makefile_is_custom="1" />
- <Option execution_dir="." />
- <Option pch_mode="2" />
- <Option compiler="gcc" />
- <Build>
- <Target title="debug">
- <Option type="4" />
- <Option compiler="gcc" />
- <Compiler>
- <Add option="-g" />
- </Compiler>
- <MakeCommands>
- <Build command="$make -f $makefile $target" />
- <CompileFile command="$make -f build/$makefile $file" />
- <Clean command="$make -f build/$makefile clean" />
- <DistClean command="$make -f $makefile distclean$target" />
- <AskRebuildNeeded command="$make -q -f $makefile $target" />
- <SilentBuild command="$make -s -f $makefile $target" />
- </MakeCommands>
- </Target>
- <Target title="release">
- <Option type="4" />
- <Option compiler="gcc" />
- <Compiler>
- <Add option="-O2" />
- </Compiler>
- <Linker>
- <Add option="-s" />
- </Linker>
- <MakeCommands>
- <Build command="$make -f $makefile $target" />
- <CompileFile command="$make -f $makefile $file" />
- <Clean command="$make -f $makefile clean" />
- <DistClean command="$make -f $makefile distclean$target" />
- <AskRebuildNeeded command="$make -q -f $makefile $target" />
- <SilentBuild command="$make -s -f $makefile $target" />
- </MakeCommands>
- </Target>
- </Build>
- <Compiler>
- <Add option="-Wall" />
- <Add directory="/usr/include" />
- <Add directory="/usr/include/QtGui" />
- </Compiler>
- <Linker>
- <Add library="QtCore" />
- <Add library="QtGui" />
- <Add directory="/usr/lib" />
- </Linker>
- <Unit filename="CHANGELOG" />
- <Unit filename="CMakeLists.txt" />
- <Unit filename="COPYING" />
- <Unit filename="Makefile" />
- <Unit filename="README" />
- <Unit filename="TODO" />
- <Unit filename="i18n/CMakeLists.txt" />
- <Unit filename="i18n/app.pro" />
- <Unit filename="qasconfig/CMakeLists.txt" />
- <Unit filename="qasconfig/graphics/CMakeLists.txt" />
- <Unit filename="qasconfig/share/CMakeLists.txt" />
- <Unit filename="qasconfig/share/application.desktop" />
- <Unit filename="qasconfig/share/man/CMakeLists.txt" />
- <Unit filename="qasconfig/share/man/manpage.1.cmake" />
- <Unit filename="qasconfig/src/CMakeLists.txt" />
- <Unit filename="qasconfig/src/desktop_items.cpp" />
- <Unit filename="qasconfig/src/desktop_items.hpp" />
- <Unit filename="qasconfig/src/info_texts.cpp" />
- <Unit filename="qasconfig/src/info_texts.hpp" />
- <Unit filename="qasconfig/src/main.cpp" />
- <Unit filename="qasconfig/src/main_window.cpp" />
- <Unit filename="qasconfig/src/main_window.hpp" />
- <Unit filename="qasconfig/src/qsnd/alsa_config_model.cpp" />
- <Unit filename="qasconfig/src/qsnd/alsa_config_model.hpp" />
- <Unit filename="qasconfig/src/static_tree.cpp" />
- <Unit filename="qasconfig/src/static_tree.hpp" />
- <Unit filename="qasconfig/src/static_tree_model.cpp" />
- <Unit filename="qasconfig/src/static_tree_model.hpp" />
- <Unit filename="qasconfig/src/views/alsa_config_view.cpp" />
- <Unit filename="qasconfig/src/views/alsa_config_view.hpp" />
- <Unit filename="qashctl/CMakeLists.txt" />
- <Unit filename="qashctl/graphics/CMakeLists.txt" />
- <Unit filename="qashctl/share/CMakeLists.txt" />
- <Unit filename="qashctl/share/application.desktop" />
- <Unit filename="qashctl/share/man/CMakeLists.txt" />
- <Unit filename="qashctl/share/man/manpage.1.cmake" />
- <Unit filename="qashctl/src/CMakeLists.txt" />
- <Unit filename="qashctl/src/desktop_items.cpp" />
- <Unit filename="qashctl/src/desktop_items.hpp" />
- <Unit filename="qashctl/src/info_texts.cpp" />
- <Unit filename="qashctl/src/info_texts.hpp" />
- <Unit filename="qashctl/src/main.cpp" />
- <Unit filename="qashctl/src/main_window.cpp" />
- <Unit filename="qashctl/src/main_window.hpp" />
- <Unit filename="qashctl/src/main_window_setup.cpp" />
- <Unit filename="qashctl/src/main_window_setup.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_bool.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_bool.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_enum.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_enum.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_int.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_int.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_unsupported.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_edit_unsupported.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_editor.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_editor.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_editor_data.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_editor_data.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_int_proxies_group.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_int_proxies_group.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_int_proxy_column.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_int_proxy_column.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_int_proxy_slider.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_int_proxy_slider.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxies_group.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxies_group.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxy.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxy.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxy_enum.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxy_enum.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxy_switch.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_proxy_switch.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_slider_status_widget.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_slider_status_widget.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_table_model.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_table_model.hpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_tree_model.cpp" />
- <Unit filename="qashctl/src/mwdg/mixer_hctl_tree_model.hpp" />
- <Unit filename="qashctl/src/views/mixer_hctl.cpp" />
- <Unit filename="qashctl/src/views/mixer_hctl.hpp" />
- <Unit filename="qashctl/src/views/mixer_hctl_setup.cpp" />
- <Unit filename="qashctl/src/views/mixer_hctl_setup.hpp" />
- <Unit filename="qasmixer/CMakeLists.txt" />
- <Unit filename="qasmixer/graphics/CMakeLists.txt" />
- <Unit filename="qasmixer/share/CMakeLists.txt" />
- <Unit filename="qasmixer/share/application.desktop" />
- <Unit filename="qasmixer/share/man/CMakeLists.txt" />
- <Unit filename="qasmixer/share/man/manpage.1.cmake" />
- <Unit filename="qasmixer/src/CMakeLists.txt" />
- <Unit filename="qasmixer/src/cmd_options.cpp" />
- <Unit filename="qasmixer/src/cmd_options.hpp" />
- <Unit filename="qasmixer/src/desktop_items.cpp" />
- <Unit filename="qasmixer/src/desktop_items.hpp" />
- <Unit filename="qasmixer/src/desktop_items_setup.cpp" />
- <Unit filename="qasmixer/src/desktop_items_setup.hpp" />
- <Unit filename="qasmixer/src/info_texts.cpp" />
- <Unit filename="qasmixer/src/info_texts.hpp" />
- <Unit filename="qasmixer/src/init_globals.cpp" />
- <Unit filename="qasmixer/src/init_globals.hpp" />
- <Unit filename="qasmixer/src/main.cpp" />
- <Unit filename="qasmixer/src/main_window.cpp" />
- <Unit filename="qasmixer/src/main_window.hpp" />
- <Unit filename="qasmixer/src/main_window_setup.cpp" />
- <Unit filename="qasmixer/src/main_window_setup.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_gui_state.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_gui_state.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_separation_info.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_separation_info.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_simple_setup.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_simple_setup.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxies_column.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxies_column.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxies_group.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxies_group.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxy_slider.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxy_slider.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxy_switch.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_proxy_switch.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_status_widget.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_sliders_status_widget.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches_proxies_group.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches_proxies_group.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches_proxy_enum.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches_proxy_enum.hpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches_proxy_switch.cpp" />
- <Unit filename="qasmixer/src/mwdg/mixer_switches_proxy_switch.hpp" />
- <Unit filename="qasmixer/src/tray_mixer.cpp" />
- <Unit filename="qasmixer/src/tray_mixer.hpp" />
- <Unit filename="qasmixer/src/tray_mixer_balloon.cpp" />
- <Unit filename="qasmixer/src/tray_mixer_balloon.hpp" />
- <Unit filename="qasmixer/src/tray_mixer_icon.cpp" />
- <Unit filename="qasmixer/src/tray_mixer_icon.hpp" />
- <Unit filename="qasmixer/src/tray_mixer_mdev_setup.cpp" />
- <Unit filename="qasmixer/src/tray_mixer_mdev_setup.hpp" />
- <Unit filename="qasmixer/src/tray_mixer_view_setup.cpp" />
- <Unit filename="qasmixer/src/tray_mixer_view_setup.hpp" />
- <Unit filename="qasmixer/src/views/mixer_simple.cpp" />
- <Unit filename="qasmixer/src/views/mixer_simple.hpp" />
- <Unit filename="qasmixer/src/views/mixer_simple_setup.cpp" />
- <Unit filename="qasmixer/src/views/mixer_simple_setup.hpp" />
- <Unit filename="qasmixer/src/views/settings_dialog.cpp" />
- <Unit filename="qasmixer/src/views/settings_dialog.hpp" />
- <Unit filename="qasmixer/src/views/settings_dialog_setup.cpp" />
- <Unit filename="qasmixer/src/views/settings_dialog_setup.hpp" />
- <Unit filename="scripts/create_pro_file.py" />
- <Unit filename="scripts/fix_header.py" />
- <Unit filename="scripts/render_png.sh" />
- <Unit filename="shared/CMakeLists.txt" />
- <Unit filename="shared/graphics/CMakeLists.txt" />
- <Unit filename="shared/src/dpe/image.cpp" />
- <Unit filename="shared/src/dpe/image.hpp" />
- <Unit filename="shared/src/dpe/image_allocator.cpp" />
- <Unit filename="shared/src/dpe/image_allocator.hpp" />
- <Unit filename="shared/src/dpe/image_request.cpp" />
- <Unit filename="shared/src/dpe/image_request.hpp" />
- <Unit filename="shared/src/dpe/image_set.cpp" />
- <Unit filename="shared/src/dpe/image_set.hpp" />
- <Unit filename="shared/src/dpe/image_set_group.cpp" />
- <Unit filename="shared/src/dpe/image_set_group.hpp" />
- <Unit filename="shared/src/dpe/image_set_meta.cpp" />
- <Unit filename="shared/src/dpe/image_set_meta.hpp" />
- <Unit filename="shared/src/dpe/image_set_state.cpp" />
- <Unit filename="shared/src/dpe/image_set_state.hpp" />
- <Unit filename="shared/src/dpe/is_buffer.cpp" />
- <Unit filename="shared/src/dpe/is_buffer.hpp" />
- <Unit filename="shared/src/dpe/is_buffer_handle.cpp" />
- <Unit filename="shared/src/dpe/is_buffer_handle.hpp" />
- <Unit filename="shared/src/dpe/paint_job.cpp" />
- <Unit filename="shared/src/dpe/paint_job.hpp" />
- <Unit filename="shared/src/dpe/painter.cpp" />
- <Unit filename="shared/src/dpe/painter.hpp" />
- <Unit filename="shared/src/dpe/painter_simple.cpp" />
- <Unit filename="shared/src/dpe/painter_simple.hpp" />
- <Unit filename="shared/src/dpe/painter_thread.cpp" />
- <Unit filename="shared/src/dpe/painter_thread.hpp" />
- <Unit filename="shared/src/dpe/painter_thread_shared.cpp" />
- <Unit filename="shared/src/dpe/painter_thread_shared.hpp" />
- <Unit filename="shared/src/license_texts.cpp" />
- <Unit filename="shared/src/license_texts.hpp" />
- <Unit filename="shared/src/mwdg/controls_delegate.cpp" />
- <Unit filename="shared/src/mwdg/controls_delegate.hpp" />
- <Unit filename="shared/src/mwdg/controls_view.cpp" />
- <Unit filename="shared/src/mwdg/controls_view.hpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view.cpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view.hpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view_card.cpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view_card.hpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view_integer.cpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view_integer.hpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view_string.cpp" />
- <Unit filename="shared/src/mwdg/ctl_arg_view_string.hpp" />
- <Unit filename="shared/src/mwdg/event_types.cpp" />
- <Unit filename="shared/src/mwdg/event_types.hpp" />
- <Unit filename="shared/src/mwdg/inputs_setup.cpp" />
- <Unit filename="shared/src/mwdg/inputs_setup.hpp" />
- <Unit filename="shared/src/mwdg/mixer_device_setup.cpp" />
- <Unit filename="shared/src/mwdg/mixer_device_setup.hpp" />
- <Unit filename="shared/src/mwdg/mixer_style.cpp" />
- <Unit filename="shared/src/mwdg/mixer_style.hpp" />
- <Unit filename="shared/src/mwdg/slider_status_widget.cpp" />
- <Unit filename="shared/src/mwdg/slider_status_widget.hpp" />
- <Unit filename="shared/src/qastools_config.hpp.cmake" />
- <Unit filename="shared/src/qsnd/alsa.cpp" />
- <Unit filename="shared/src/qsnd/alsa.hpp" />
- <Unit filename="shared/src/qsnd/alsa_config_watcher.cpp" />
- <Unit filename="shared/src/qsnd/alsa_config_watcher.hpp" />
- <Unit filename="shared/src/qsnd/alsa_i18n.hpp" />
- <Unit filename="shared/src/qsnd/card_info.cpp" />
- <Unit filename="shared/src/qsnd/card_info.hpp" />
- <Unit filename="shared/src/qsnd/cards_model.cpp" />
- <Unit filename="shared/src/qsnd/cards_model.hpp" />
- <Unit filename="shared/src/qsnd/controls_database.cpp" />
- <Unit filename="shared/src/qsnd/controls_database.hpp" />
- <Unit filename="shared/src/qsnd/controls_model.cpp" />
- <Unit filename="shared/src/qsnd/controls_model.hpp" />
- <Unit filename="shared/src/qsnd/ctl_address.cpp" />
- <Unit filename="shared/src/qsnd/ctl_address.hpp" />
- <Unit filename="shared/src/qsnd/ctl_address_argument.cpp" />
- <Unit filename="shared/src/qsnd/ctl_address_argument.hpp" />
- <Unit filename="shared/src/qsnd/ctl_format.cpp" />
- <Unit filename="shared/src/qsnd/ctl_format.hpp" />
- <Unit filename="shared/src/qsnd/ctl_format_argument.cpp" />
- <Unit filename="shared/src/qsnd/ctl_format_argument.hpp" />
- <Unit filename="shared/src/qsnd/event_types.cpp" />
- <Unit filename="shared/src/qsnd/event_types.hpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl.cpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl.hpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl_elem.cpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl_elem.hpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl_elem_group.cpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl_elem_group.hpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl_info_db.cpp" />
- <Unit filename="shared/src/qsnd/mixer_hctl_info_db.hpp" />
- <Unit filename="shared/src/qsnd/mixer_simple.cpp" />
- <Unit filename="shared/src/qsnd/mixer_simple.hpp" />
- <Unit filename="shared/src/qsnd/mixer_simple_elem.cpp" />
- <Unit filename="shared/src/qsnd/mixer_simple_elem.hpp" />
- <Unit filename="shared/src/qsnd/mixer_simple_filter.cpp" />
- <Unit filename="shared/src/qsnd/mixer_simple_filter.hpp" />
- <Unit filename="shared/src/qsnd/mixer_simple_filter_name.cpp" />
- <Unit filename="shared/src/qsnd/mixer_simple_filter_name.hpp" />
- <Unit filename="shared/src/qsnd/model_keys.hpp" />
- <Unit filename="shared/src/qsnd/pcm_device_info.cpp" />
- <Unit filename="shared/src/qsnd/pcm_device_info.hpp" />
- <Unit filename="shared/src/qsnd/pcm_subdevice_info.cpp" />
- <Unit filename="shared/src/qsnd/pcm_subdevice_info.hpp" />
- <Unit filename="shared/src/qsnd/pcm_subdevices_info.cpp" />
- <Unit filename="shared/src/qsnd/pcm_subdevices_info.hpp" />
- <Unit filename="shared/src/qsnd/udev_device_lookout.cpp" />
- <Unit filename="shared/src/qsnd/udev_device_lookout.hpp" />
- <Unit filename="shared/src/single_application.cpp" />
- <Unit filename="shared/src/single_application.hpp" />
- <Unit filename="shared/src/unix_signal_handler.cpp" />
- <Unit filename="shared/src/unix_signal_handler.hpp" />
- <Unit filename="shared/src/views/basic_dialog.cpp" />
- <Unit filename="shared/src/views/basic_dialog.hpp" />
- <Unit filename="shared/src/views/device_selection_view.cpp" />
- <Unit filename="shared/src/views/device_selection_view.hpp" />
- <Unit filename="shared/src/views/device_selection_view_setup.cpp" />
- <Unit filename="shared/src/views/device_selection_view_setup.hpp" />
- <Unit filename="shared/src/views/info_dialog.cpp" />
- <Unit filename="shared/src/views/info_dialog.hpp" />
- <Unit filename="shared/src/views/message_widget.cpp" />
- <Unit filename="shared/src/views/message_widget.hpp" />
- <Unit filename="shared/src/views/multi_page_dialog.cpp" />
- <Unit filename="shared/src/views/multi_page_dialog.hpp" />
- <Unit filename="shared/src/views/view_base.cpp" />
- <Unit filename="shared/src/views/view_base.hpp" />
- <Unit filename="shared/src/views/view_base_setup.cpp" />
- <Unit filename="shared/src/views/view_base_setup.hpp" />
- <Unit filename="shared/src/views/view_utility.cpp" />
- <Unit filename="shared/src/views/view_utility.hpp" />
- <Unit filename="shared/src/wdg/balloon_widget.cpp" />
- <Unit filename="shared/src/wdg/balloon_widget.hpp" />
- <Unit filename="shared/src/wdg/color_methods.cpp" />
- <Unit filename="shared/src/wdg/color_methods.hpp" />
- <Unit filename="shared/src/wdg/cubic_curve.cpp" />
- <Unit filename="shared/src/wdg/cubic_curve.hpp" />
- <Unit filename="shared/src/wdg/ds_imaging.cpp" />
- <Unit filename="shared/src/wdg/ds_imaging.hpp" />
- <Unit filename="shared/src/wdg/ds_slider.cpp" />
- <Unit filename="shared/src/wdg/ds_slider.hpp" />
- <Unit filename="shared/src/wdg/ds_slider_meta_bg.cpp" />
- <Unit filename="shared/src/wdg/ds_slider_meta_bg.hpp" />
- <Unit filename="shared/src/wdg/ds_slider_painter_bevelled.cpp" />
- <Unit filename="shared/src/wdg/ds_slider_painter_bevelled.hpp" />
- <Unit filename="shared/src/wdg/ds_slider_test.cpp" />
- <Unit filename="shared/src/wdg/ds_slider_test.hpp" />
- <Unit filename="shared/src/wdg/ds_slider_test_dialog.cpp" />
- <Unit filename="shared/src/wdg/ds_slider_test_dialog.hpp" />
- <Unit filename="shared/src/wdg/ds_switch.cpp" />
- <Unit filename="shared/src/wdg/ds_switch.hpp" />
- <Unit filename="shared/src/wdg/ds_switch_painter_circle.cpp" />
- <Unit filename="shared/src/wdg/ds_switch_painter_circle.hpp" />
- <Unit filename="shared/src/wdg/ds_switch_painter_close.cpp" />
- <Unit filename="shared/src/wdg/ds_switch_painter_close.hpp" />
- <Unit filename="shared/src/wdg/ds_switch_painter_svg.cpp" />
- <Unit filename="shared/src/wdg/ds_switch_painter_svg.hpp" />
- <Unit filename="shared/src/wdg/ds_widget_painter.cpp" />
- <Unit filename="shared/src/wdg/ds_widget_painter.hpp" />
- <Unit filename="shared/src/wdg/ds_widget_style_db.cpp" />
- <Unit filename="shared/src/wdg/ds_widget_style_db.hpp" />
- <Unit filename="shared/src/wdg/ds_widget_types.hpp" />
- <Unit filename="shared/src/wdg/equal_columns_layout.cpp" />
- <Unit filename="shared/src/wdg/equal_columns_layout.hpp" />
- <Unit filename="shared/src/wdg/equal_columns_layout_group.cpp" />
- <Unit filename="shared/src/wdg/equal_columns_layout_group.hpp" />
- <Unit filename="shared/src/wdg/event_types.cpp" />
- <Unit filename="shared/src/wdg/event_types.hpp" />
- <Unit filename="shared/src/wdg/fill_columns_layout.cpp" />
- <Unit filename="shared/src/wdg/fill_columns_layout.hpp" />
- <Unit filename="shared/src/wdg/label_elide.cpp" />
- <Unit filename="shared/src/wdg/label_elide.hpp" />
- <Unit filename="shared/src/wdg/label_width.cpp" />
- <Unit filename="shared/src/wdg/label_width.hpp" />
- <Unit filename="shared/src/wdg/layout_weights.cpp" />
- <Unit filename="shared/src/wdg/layout_weights.hpp" />
- <Unit filename="shared/src/wdg/pad_focus_info.cpp" />
- <Unit filename="shared/src/wdg/pad_focus_info.hpp" />
- <Unit filename="shared/src/wdg/pad_proxies_column.cpp" />
- <Unit filename="shared/src/wdg/pad_proxies_column.hpp" />
- <Unit filename="shared/src/wdg/pad_proxies_group.cpp" />
- <Unit filename="shared/src/wdg/pad_proxies_group.hpp" />
- <Unit filename="shared/src/wdg/pad_proxy.cpp" />
- <Unit filename="shared/src/wdg/pad_proxy.hpp" />
- <Unit filename="shared/src/wdg/pad_proxy_enum.cpp" />
- <Unit filename="shared/src/wdg/pad_proxy_enum.hpp" />
- <Unit filename="shared/src/wdg/pad_proxy_slider.cpp" />
- <Unit filename="shared/src/wdg/pad_proxy_slider.hpp" />
- <Unit filename="shared/src/wdg/pad_proxy_style.cpp" />
- <Unit filename="shared/src/wdg/pad_proxy_style.hpp" />
- <Unit filename="shared/src/wdg/pad_proxy_switch.cpp" />
- <Unit filename="shared/src/wdg/pad_proxy_switch.hpp" />
- <Unit filename="shared/src/wdg/pass_events.cpp" />
- <Unit filename="shared/src/wdg/pass_events.hpp" />
- <Unit filename="shared/src/wdg/scroll_area_horizontal.cpp" />
- <Unit filename="shared/src/wdg/scroll_area_horizontal.hpp" />
- <Unit filename="shared/src/wdg/scroll_area_vertical.cpp" />
- <Unit filename="shared/src/wdg/scroll_area_vertical.hpp" />
- <Unit filename="shared/src/wdg/sliders_pad.cpp" />
- <Unit filename="shared/src/wdg/sliders_pad.hpp" />
- <Unit filename="shared/src/wdg/sliders_pad_data.cpp" />
- <Unit filename="shared/src/wdg/sliders_pad_data.hpp" />
- <Unit filename="shared/src/wdg/sliders_pad_footer.cpp" />
- <Unit filename="shared/src/wdg/sliders_pad_footer.hpp" />
- <Unit filename="shared/src/wdg/sliders_pad_header.cpp" />
- <Unit filename="shared/src/wdg/sliders_pad_header.hpp" />
- <Unit filename="shared/src/wdg/sliders_pad_header_data.cpp" />
- <Unit filename="shared/src/wdg/sliders_pad_header_data.hpp" />
- <Unit filename="shared/src/wdg/sliders_pad_layout.cpp" />
- <Unit filename="shared/src/wdg/sliders_pad_layout.hpp" />
- <Unit filename="shared/src/wdg/sliders_pad_style.cpp" />
- <Unit filename="shared/src/wdg/sliders_pad_style.hpp" />
- <Unit filename="shared/src/wdg/switches_area.cpp" />
- <Unit filename="shared/src/wdg/switches_area.hpp" />
- <Unit filename="shared/src/wdg/switches_pad.cpp" />
- <Unit filename="shared/src/wdg/switches_pad.hpp" />
- <Unit filename="shared/src/wdg/switches_pad_widgets.cpp" />
- <Unit filename="shared/src/wdg/switches_pad_widgets.hpp" />
- <Unit filename="shared/src/wdg/switches_pad_widgets_group.cpp" />
- <Unit filename="shared/src/wdg/switches_pad_widgets_group.hpp" />
- <Unit filename="shared/src/wdg/text_browser.cpp" />
- <Unit filename="shared/src/wdg/text_browser.hpp" />
- <Unit filename="shared/src/wdg/tree_view_kv.cpp" />
- <Unit filename="shared/src/wdg/tree_view_kv.hpp" />
- <Unit filename="shared/src/wdg/uint_mapper.cpp" />
- <Unit filename="shared/src/wdg/uint_mapper.hpp" />
- <Extensions>
- <code_completion />
- <debugger />
- <envvars />
- </Extensions>
- </Project>
-</CodeBlocks_project_file>
diff --git a/shared/CMakeLists.txt b/shared/CMakeLists.txt
index 0abd777..f88c231 100644
--- a/shared/CMakeLists.txt
+++ b/shared/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Process subdirectories
diff --git a/shared/graphics/CMakeLists.txt b/shared/graphics/CMakeLists.txt
index 7a423a6..78499cd 100644
--- a/shared/graphics/CMakeLists.txt
+++ b/shared/graphics/CMakeLists.txt
@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED ( VERSION 2.8.11 )
# Install widgets graphics
diff --git a/shared/src/dpe/is_buffer.cpp b/shared/src/dpe/is_buffer.cpp
index 34b1fad..72dc2e1 100644
--- a/shared/src/dpe/is_buffer.cpp
+++ b/shared/src/dpe/is_buffer.cpp
@@ -147,7 +147,7 @@ IS_Buffer::return_img_set (
if ( byte_count() <= _storage_limit ) {
// Delete later
handle->remove_time.start();
- handle->remove_time.addMSecs ( 1000 );
+ handle->remove_time = handle->remove_time.addMSecs ( 1000 );
if ( !_remove_poll_timer.isActive() ) {
_remove_poll_timer.start();
}
diff --git a/shared/src/mwdg/slider_status_widget.cpp b/shared/src/mwdg/slider_status_widget.cpp
index a2cc1d9..e1bebb9 100644
--- a/shared/src/mwdg/slider_status_widget.cpp
+++ b/shared/src/mwdg/slider_status_widget.cpp
@@ -35,7 +35,7 @@ _sliders_pad ( 0 )
QFont fnt_title ( _volume_title.font() );
fnt_title.setWeight ( QFont::Bold );
- const Qt::Alignment align_lc ( Qt::AlignLeft | Qt::AlignVCenter );
+ //const Qt::Alignment align_lc ( Qt::AlignLeft | Qt::AlignVCenter );
const Qt::Alignment align_rc ( Qt::AlignRight | Qt::AlignVCenter );
const Qt::Alignment align_cc ( Qt::AlignHCenter | Qt::AlignVCenter );
diff --git a/shared/src/qsnd/mixer_simple_elem.cpp b/shared/src/qsnd/mixer_simple_elem.cpp
index 5865adb..bd9da92 100644
--- a/shared/src/qsnd/mixer_simple_elem.cpp
+++ b/shared/src/qsnd/mixer_simple_elem.cpp
@@ -520,8 +520,8 @@ Mixer_Simple_Elem::ask_dB_vol_nearest (
long db_above ( ask_vol_dB ( snd_dir_n, vol_above ) );
long db_below ( ask_vol_dB ( snd_dir_n, vol_below ) );
- db_above = abs ( db_above - dB_value_n );
- db_below = abs ( dB_value_n - db_below );
+ db_above = ::std::abs ( db_above - dB_value_n );
+ db_below = ::std::abs ( dB_value_n - db_below );
if ( db_above > db_below ) {
res = vol_below;
diff --git a/shared/src/qsnd/udev_device_lookout.cpp b/shared/src/qsnd/udev_device_lookout.cpp
index b81be15..6ee344a 100644
--- a/shared/src/qsnd/udev_device_lookout.cpp
+++ b/shared/src/qsnd/udev_device_lookout.cpp
@@ -87,7 +87,7 @@ UDev_Device_Lookout::udev_process ( )
::udev_device * dev (
::udev_monitor_receive_device ( _udev_mon ) );
if ( dev != 0 ) {
-#ifndef NDEBUG
+#ifdef QASTOOLS_UDEV_DEBUG
{
::std::string devnode;
::std::string subsystem;
@@ -111,7 +111,7 @@ UDev_Device_Lookout::udev_process ( )
::std::cout << " Devtype: " << devtype << "\n";
::std::cout << " Action: " << action << "\n";
}
-#endif // NDEBUG
+#endif
::udev_device_unref ( dev );
any_change = true;
} else {
diff --git a/shared/src/wdg/ds_slider.cpp b/shared/src/wdg/ds_slider.cpp
index 58700fb..9d08b73 100644
--- a/shared/src/wdg/ds_slider.cpp
+++ b/shared/src/wdg/ds_slider.cpp
@@ -1108,7 +1108,7 @@ DS_Slider::anim_tick ( )
if ( _anim_run_snap ) {
// Passed seconds since the animation start
- unsigned int msec ( abs ( _anim_snap_time.elapsed() ) );
+ unsigned int msec ( ::std::abs ( _anim_snap_time.elapsed() ) );
if ( msec >= _anim_snap_msec_max ) {
msec = _anim_snap_msec_max;
_anim_run_snap = false;
@@ -1142,7 +1142,7 @@ DS_Slider::anim_snap_start ( )
if ( _anim_run_snap ) {
// A snapping annimation is already running.
- unsigned int msec ( abs ( _anim_snap_time.elapsed() ) );
+ unsigned int msec ( ::std::abs ( _anim_snap_time.elapsed() ) );
if ( msec < _anim_snap_msec_max ) {
// Acquire the current speed
v_x0 = double ( msec ) / 1000.0;
diff --git a/shared/src/wdg/equal_columns_layout.cpp b/shared/src/wdg/equal_columns_layout.cpp
index 4215b51..7ffe537 100644
--- a/shared/src/wdg/equal_columns_layout.cpp
+++ b/shared/src/wdg/equal_columns_layout.cpp
@@ -54,7 +54,6 @@ QLayout ( parent_n ),
_smallest_group_dist ( 0 ),
_smallest_column_dist ( 0 ),
_spacing_vertical ( 7 ),
-_mass_change ( 0 ),
_cache_dirty ( true )
{
_col_type_min_widths[0] = 3; // Horizontal spacing minor
diff --git a/shared/src/wdg/equal_columns_layout.hpp b/shared/src/wdg/equal_columns_layout.hpp
index 5ef15fd..48cdc94 100644
--- a/shared/src/wdg/equal_columns_layout.hpp
+++ b/shared/src/wdg/equal_columns_layout.hpp
@@ -228,8 +228,6 @@ class Equal_Columns_Layout :
int _spacing_vertical;
- unsigned int _mass_change;
-
bool _cache_dirty;
};
diff --git a/shared/src/wdg/tree_view_kv.cpp b/shared/src/wdg/tree_view_kv.cpp
index d66933f..134511e 100644
--- a/shared/src/wdg/tree_view_kv.cpp
+++ b/shared/src/wdg/tree_view_kv.cpp
@@ -23,7 +23,7 @@ Tree_View_KV::Tree_View_KV (
QTreeView ( parent ),
_activate_current ( true )
{
- header()->setResizeMode ( QHeaderView::Interactive );
+ header()->setSectionResizeMode ( QHeaderView::Interactive );
}
--
qastools packaging
More information about the pkg-multimedia-commits
mailing list