mirror of
https://github.com/transmission/transmission
synced 2024-12-22 07:42:37 +00:00
(trunk qt) sort of fix the "make install" problem
This commit is contained in:
parent
221b6903ee
commit
768d755cc6
4 changed files with 18 additions and 35 deletions
|
@ -26,7 +26,7 @@ ABOUT QTRANSMISSION
|
|||
from a remote site, then transmission-remote and the web and Qt clients
|
||||
are a good match.
|
||||
|
||||
To use the Qt client as a remote: "qtransmission -r http://host:port/"
|
||||
To use the Qt client as a remote: "qtr -r http://host:port/"
|
||||
|
||||
The Qt client is also the most likely to wind up running on Windows,
|
||||
though that's not a high priority at the moment...
|
||||
|
@ -37,7 +37,8 @@ BUILDING
|
|||
|
||||
1. Prerequisites: Qt >= 4.x and its development packages
|
||||
2. Build Transmission as normal
|
||||
3. In the qt/ directory, type "qmake-qt4 qtransmission.pro"
|
||||
3. In the qt/ directory, type "qmake-qt4"
|
||||
4. In the qt/ directory, type "make"
|
||||
5. In the qt/ directory, as root, type "make install"
|
||||
5. In the qt/ directory, as root, type "INSTALL_ROOT=/usr make install"
|
||||
(Feel free to replace /usr with /usr/local or /opt or whatever)
|
||||
|
||||
|
|
|
@ -435,7 +435,7 @@ PrefsDialog :: encryptionEdited( int i )
|
|||
}
|
||||
|
||||
QWidget *
|
||||
PrefsDialog :: createPeersTab( const Session& session )
|
||||
PrefsDialog :: createPeersTab( )
|
||||
{
|
||||
HIG * hig = new HIG( this );
|
||||
hig->addSectionTitle( tr( "Blocklist" ) );
|
||||
|
@ -571,7 +571,7 @@ PrefsDialog :: PrefsDialog( Session& session, Prefs& prefs, QWidget * parent ):
|
|||
|
||||
QTabWidget * t = new QTabWidget( this );
|
||||
t->addTab( createTorrentsTab( ), tr( "Torrents" ) );
|
||||
t->addTab( createPeersTab( session ), tr( "Peers" ) );
|
||||
t->addTab( createPeersTab( ), tr( "Peers" ) );
|
||||
t->addTab( createBandwidthTab( ), tr( "Speed" ) );
|
||||
t->addTab( createNetworkTab( ), tr( "Network" ) );
|
||||
t->addTab( createWebTab( session ), tr( "Web" ) );
|
||||
|
|
|
@ -78,7 +78,7 @@ class PrefsDialog: public QDialog
|
|||
private:
|
||||
bool isAllowed( int key ) const;
|
||||
QWidget * createTorrentsTab( );
|
||||
QWidget * createPeersTab( const Session& session );
|
||||
QWidget * createPeersTab( );
|
||||
QWidget * createNetworkTab( );
|
||||
QWidget * createBandwidthTab( );
|
||||
QWidget * createWebTab( Session& );
|
||||
|
|
|
@ -1,9 +1,15 @@
|
|||
TARGET = qtr
|
||||
NAME = "Transmission"
|
||||
DESCRIPTION = "Transmission: a fast, easy, and free BitTorrent client"
|
||||
VERSION = 1.6.0
|
||||
LICENSE = "GPL"
|
||||
|
||||
target.path = /bin
|
||||
INSTALLS += target
|
||||
|
||||
CONFIG += qt thread debug link_pkgconfig
|
||||
QT += network
|
||||
PKGCONFIG = fontconfig libcurl openssl
|
||||
INCLUDEPATH += .
|
||||
|
||||
TRANSMISSION_TOP = ..
|
||||
INCLUDEPATH += $${TRANSMISSION_TOP}
|
||||
|
@ -12,35 +18,10 @@ LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
|
|||
LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
|
||||
LIBS += $${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a
|
||||
|
||||
TRANSLATIONS += transmission_en.ts
|
||||
|
||||
FORMS += mainwin.ui about.ui
|
||||
|
||||
RESOURCES += application.qrc
|
||||
|
||||
HEADERS += about.h \
|
||||
app.h \
|
||||
details.h \
|
||||
file-tree.h \
|
||||
filters.h \
|
||||
hig.h \
|
||||
mainwin.h \
|
||||
make-dialog.h \
|
||||
options.h \
|
||||
prefs-dialog.h \
|
||||
prefs.h \
|
||||
qticonloader.h \
|
||||
session.h \
|
||||
speed.h \
|
||||
squeezelabel.h \
|
||||
stats-dialog.h \
|
||||
torrent-delegate.h \
|
||||
torrent-delegate-min.h \
|
||||
torrent-filter.h \
|
||||
torrent.h \
|
||||
torrent-model.h \
|
||||
types.h \
|
||||
utils.h \
|
||||
watchdir.h \
|
||||
|
||||
SOURCES += about.cc \
|
||||
app.cc \
|
||||
details.cc \
|
||||
|
@ -63,5 +44,6 @@ SOURCES += about.cc \
|
|||
torrent-model.cc \
|
||||
utils.cc \
|
||||
watchdir.cc
|
||||
HEADERS += $$replace(SOURCES, .cc, .h)
|
||||
HEADERS += speed.h types.h
|
||||
|
||||
TRANSLATIONS += transmission_en.ts
|
Loading…
Reference in a new issue