From 768d755cc69b7bf7ea279a9614b4a13343fb8122 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Mon, 13 Apr 2009 17:31:02 +0000
Subject: [PATCH] (trunk qt) sort of fix the "make install" problem

---
 qt/README.txt                     |  7 +++---
 qt/prefs-dialog.cc                |  4 ++--
 qt/prefs-dialog.h                 |  2 +-
 qt/{qtransmission.pro => qtr.pro} | 40 +++++++++----------------------
 4 files changed, 18 insertions(+), 35 deletions(-)
 rename qt/{qtransmission.pro => qtr.pro} (64%)

diff --git a/qt/README.txt b/qt/README.txt
index a4267a223..0298741f2 100644
--- a/qt/README.txt
+++ b/qt/README.txt
@@ -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)
 
diff --git a/qt/prefs-dialog.cc b/qt/prefs-dialog.cc
index 462628dc9..6ae6d3fe7 100644
--- a/qt/prefs-dialog.cc
+++ b/qt/prefs-dialog.cc
@@ -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" ) );
diff --git a/qt/prefs-dialog.h b/qt/prefs-dialog.h
index 2399d67e4..3f4090fbc 100644
--- a/qt/prefs-dialog.h
+++ b/qt/prefs-dialog.h
@@ -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& );
diff --git a/qt/qtransmission.pro b/qt/qtr.pro
similarity index 64%
rename from qt/qtransmission.pro
rename to qt/qtr.pro
index fcecfa9cc..da6ea7d0c 100644
--- a/qt/qtransmission.pro
+++ b/qt/qtr.pro
@@ -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