- corrected makefile

git-svn-id: file:///svnroot/qtrapids/trunk@15 42ac0dd5-4c8c-4c71-bb3e-ecdfe252ffda

diff --git a/qtrapids.kdevelop b/qtrapids.kdevelop
index da398ee..f687b06 100644 (file)
--- a/qtrapids.kdevelop
+++ b/qtrapids.kdevelop
@@ -14,8 +14,8 @@
     <projectname>qtrapids</projectname>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <projectname>qtrapids</projectname>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>

-    <description></description>
-    <defaultencoding></defaultencoding>
+    <description/>
+    <defaultencoding/>

   </general>
   <kdevfileview>
     <groups>
   </general>
   <kdevfileview>
     <groups>

@@ -67,7 +67,7 @@
       <includePaths>.;</includePaths>
     </codecompletion>
     <creategettersetter>
       <includePaths>.;</includePaths>
     </codecompletion>
     <creategettersetter>

-      <prefixGet></prefixGet>
+      <prefixGet/>

       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>

@@ -125,16 +125,16 @@
   </kdevdoctreeview>
   <kdevdebugger>
     <general>
   </kdevdoctreeview>
   <kdevdebugger>
     <general>

-      <dbgshell></dbgshell>
+      <dbgshell/>

       <breakpoints/>
       <programargs/>
       <gdbpath>/usr/bin/gdb</gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
       <breakpoints/>
       <programargs/>
       <gdbpath>/usr/bin/gdb</gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>

-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>

       <raiseGDBOnStart>false</raiseGDBOnStart>
     </general>
     <display>
       <raiseGDBOnStart>false</raiseGDBOnStart>
     </general>
     <display>

@@ -147,9 +147,9 @@
   <kdevtrollproject>
     <run>
       <mainprogram>/home/vaatala/Projects/qtrapids/trunk/bin/qtrapids</mainprogram>
   <kdevtrollproject>
     <run>
       <mainprogram>/home/vaatala/Projects/qtrapids/trunk/bin/qtrapids</mainprogram>

-      <programargs></programargs>
+      <programargs/>

       <directoryradio>executable</directoryradio>
       <directoryradio>executable</directoryradio>

-      <globaldebugarguments></globaldebugarguments>
+      <globaldebugarguments/>

       <globalcwd>/home/vaatala/Projects/qtrapids/trunk/bin</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <terminal>false</terminal>
       <globalcwd>/home/vaatala/Projects/qtrapids/trunk/bin</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <terminal>false</terminal>

@@ -170,14 +170,14 @@
       </debugarguments>
     </run>
     <general>
       </debugarguments>
     </run>
     <general>

-      <activedir>src/gui</activedir>
+      <activedir>src</activedir>

     </general>
     <make>
       <abortonerror>true</abortonerror>
       <runmultiplejobs>false</runmultiplejobs>
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
     </general>
     <make>
       <abortonerror>true</abortonerror>
       <runmultiplejobs>false</runmultiplejobs>
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>

-      <makebin></makebin>
+      <makebin/>

       <prio>0</prio>
       <envvars/>
     </make>
       <prio>0</prio>
       <envvars/>
     </make>

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 9c23ca1..498841f 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -28,6 +28,5 @@ LIBS += -L../../bin \
   -L../engine
 
 QMAKE_LFLAGS_DEBUG += -L.
   -L../engine
 
 QMAKE_LFLAGS_DEBUG += -L.

-TARGETDEPS += ../engine/liblibqtbittorrent.so \
-  ../../bin/libqtbittorrent.so
+TARGETDEPS += ../../bin/libqtbittorrent.so