mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-12 01:23:43 +02:00
2018-08-07 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'pam_rd' plug-in. * Removed rdchunk(1). * Upgraded Qt3 to Qt4.
This commit is contained in:
@@ -20,8 +20,8 @@
|
||||
##
|
||||
## Use automake to process this into a Makefile.in
|
||||
|
||||
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
|
||||
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
|
||||
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
|
||||
LIBS = -L$(top_srcdir)/lib
|
||||
MOC = @QT_MOC@
|
||||
|
||||
# The dependency for qt's Meta Object Compiler (moc)
|
||||
@@ -37,8 +37,8 @@ uninstall-local:
|
||||
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcartslots_*.qm
|
||||
|
||||
all:
|
||||
@QT_BIN@/lupdate rdcartslots.pro
|
||||
@QT_BIN@/lrelease rdcartslots.pro
|
||||
lupdate-qt4 rdcartslots.pro
|
||||
lrelease-qt4 rdcartslots.pro
|
||||
|
||||
bin_PROGRAMS = rdcartslots
|
||||
|
||||
@@ -47,7 +47,7 @@ dist_rdcartslots_SOURCES = local_macros.cpp\
|
||||
|
||||
nodist_rdcartslots_SOURCES = moc_rdcartslots.cpp
|
||||
|
||||
rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
EXTRA_DIST = rdcartslots.pro\
|
||||
rdcartslots_de.ts\
|
||||
|
@@ -31,6 +31,9 @@
|
||||
#include <qtextcodec.h>
|
||||
#include <qpainter.h>
|
||||
#include <qpixmap.h>
|
||||
//Added by qt3to4:
|
||||
#include <QCloseEvent>
|
||||
#include <QPaintEvent>
|
||||
|
||||
#include <dbversion.h>
|
||||
#include <rd.h>
|
||||
@@ -246,7 +249,7 @@ int main(int argc,char *argv[])
|
||||
// Load Translations
|
||||
//
|
||||
QTranslator qt(0);
|
||||
qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(),".");
|
||||
qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),".");
|
||||
a.installTranslator(&qt);
|
||||
QTranslator rd(0);
|
||||
rd.load(QString(PREFIX)+QString("/share/rivendell/librd_")+
|
||||
|
@@ -26,6 +26,9 @@
|
||||
#include <qwidget.h>
|
||||
#include <qtimer.h>
|
||||
#include <qpixmap.h>
|
||||
//Added by qt3to4:
|
||||
#include <QPaintEvent>
|
||||
#include <QCloseEvent>
|
||||
|
||||
#include <rdstereometer.h>
|
||||
#include <rdcae.h>
|
||||
|
@@ -1,4 +1,6 @@
|
||||
<!DOCTYPE TS><TS>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.0">
|
||||
<context>
|
||||
<name>MainWidget</name>
|
||||
<message>
|
||||
|
@@ -1,4 +1,6 @@
|
||||
<!DOCTYPE TS><TS>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.0">
|
||||
<context>
|
||||
<name>MainWidget</name>
|
||||
<message>
|
||||
|
@@ -1,4 +1,6 @@
|
||||
<!DOCTYPE TS><TS>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.0">
|
||||
<context>
|
||||
<name>MainWidget</name>
|
||||
<message>
|
||||
|
@@ -1,4 +1,6 @@
|
||||
<!DOCTYPE TS><TS>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.0">
|
||||
<context>
|
||||
<name>MainWidget</name>
|
||||
<message>
|
||||
|
@@ -1,4 +1,6 @@
|
||||
<!DOCTYPE TS><TS>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.0">
|
||||
<context>
|
||||
<name>MainWidget</name>
|
||||
<message>
|
||||
|
@@ -1,4 +1,6 @@
|
||||
<!DOCTYPE TS><TS>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.0">
|
||||
<context>
|
||||
<name>MainWidget</name>
|
||||
<message>
|
||||
|
Reference in New Issue
Block a user