Compare commits
3 Commits
release-0.17
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| fa2ed7da93 | |||
| 56902bc871 | |||
| e467e60bd7 |
+1
-1
@@ -19,7 +19,7 @@
|
||||
# $Id$
|
||||
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.21)
|
||||
PROJECT(qlscribe VERSION 0.17 LANGUAGES CXX)
|
||||
PROJECT(qlscribe VERSION 0.20 LANGUAGES CXX)
|
||||
|
||||
SET(CMAKE_CXX_STANDARD 17)
|
||||
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
NEWS - list of user-visible changes between releases of qlscribe
|
||||
|
||||
New in 0.19
|
||||
-----------
|
||||
* Fixed desktop-entry conformance and packaging cache integration.
|
||||
|
||||
New in 0.18
|
||||
-----------
|
||||
* Fixed the mandatory 32-bit printing daemon build with GCC 15.
|
||||
* Fixed 32-bit D-Bus library detection on multilib Gentoo systems.
|
||||
|
||||
New in 0.17
|
||||
-----------
|
||||
* Ported the application and build system from Qt 4 to Qt 6.
|
||||
|
||||
+10
-3
@@ -22,9 +22,16 @@ FIND_PATH( DBUS_INCLUDE_DIR dbus/dbus.h
|
||||
PATH_SUFFIXES dbus-1.0 )
|
||||
|
||||
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
|
||||
FIND_LIBRARY( DBUS_LIBRARY dbus-1
|
||||
PATHS /lib32 /usr/lib32 /usr/local/lib32
|
||||
NO_DEFAULT_PATH )
|
||||
# Gentoo's 32-bit ABI lives in /usr/lib. find_library() rewrites
|
||||
# that path to lib64 for a 64-bit CMake process, so select the
|
||||
# existing multilib file explicitly.
|
||||
IF(EXISTS "/usr/lib/libdbus-1.so")
|
||||
SET(DBUS_LIBRARY "/usr/lib/libdbus-1.so" CACHE FILEPATH
|
||||
"32-bit D-Bus library" FORCE)
|
||||
ELSEIF(EXISTS "/usr/lib32/libdbus-1.so")
|
||||
SET(DBUS_LIBRARY "/usr/lib32/libdbus-1.so" CACHE FILEPATH
|
||||
"32-bit D-Bus library" FORCE)
|
||||
ENDIF()
|
||||
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
|
||||
|
||||
FIND_LIBRARY( DBUS_LIBRARY dbus-1 )
|
||||
|
||||
@@ -60,8 +60,8 @@ ADD_DEFINITIONS( -Wall )
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
|
||||
ADD_EXECUTABLE( lscribed ${LSCRIBED_SRCS} )
|
||||
SET_TARGET_PROPERTIES(lscribed PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
|
||||
|
||||
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
|
||||
|
||||
INSTALL( TARGETS lscribed DESTINATION sbin )
|
||||
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
#include "dbuscpp.h"
|
||||
#include "lscribed.h"
|
||||
|
||||
#include <ctime>
|
||||
|
||||
using namespace DBusCpp;
|
||||
|
||||
MessageHandler::~MessageHandler()
|
||||
@@ -216,4 +218,3 @@ const char *Message::member() const
|
||||
{
|
||||
return dbus_message_get_member( m_message );
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
Encoding=UTF-8
|
||||
Name=Qt lightScribe
|
||||
Exec=qlscribe
|
||||
Icon=qlscribe.png
|
||||
Icon=qlscribe
|
||||
Terminal=false
|
||||
Type=Application
|
||||
MimeType=application/x-qlscribe;
|
||||
|
||||
+2
-3
@@ -57,9 +57,8 @@ int main( int argc, char **argv )
|
||||
{
|
||||
QApplication app( argc, argv );
|
||||
app.setApplicationName( "qlscribe" );
|
||||
//app.setOrganizationName( "" );
|
||||
app.setOrganizationDomain( "qlscribe.sourceforge.org" );
|
||||
app.addLibraryPath( "/usr/lib32/qt4/plugins" );
|
||||
app.setOrganizationName( "disconnected-by-peer.at" );
|
||||
app.setOrganizationDomain( "disconnected-by-peer.at" );
|
||||
app.setWindowIcon( QIcon( ":/qlscribe64.png" ) );
|
||||
|
||||
bool doPrint = false;
|
||||
|
||||
+4
-3
@@ -547,10 +547,11 @@ void MainWindow::onMenuAbout()
|
||||
{
|
||||
QMessageBox::about( this,
|
||||
tr( "About" ),
|
||||
tr( "<h3>qlscribe - Qt lisghtScribe</h3>"
|
||||
"<p>release 0.17</p>"
|
||||
tr( "<h3>qlscribe - Qt LightScribe</h3>"
|
||||
"<p>release 0.20</p>"
|
||||
"<p>visit project at home page "
|
||||
"<a href=\"http://qlscribe.sourceforge.net/\">qlscribe.sourceforge.net</a></p>" ) );
|
||||
"<a href=\"https://gitea.disconnected-by-peer.at/geos_one/qlscribe\">"
|
||||
"gitea.disconnected-by-peer.at/geos_one/qlscribe</a></p>" ) );
|
||||
}
|
||||
|
||||
void MainWindow::onMenuQtAbout()
|
||||
|
||||
Reference in New Issue
Block a user