[PC-BSD Commits] r2800 - in pcbsd/branches/7.0: . CrashHandler PBIdelete PBReg SoundError ethernetconfig kcmPBMsource

svn at pcbsd.org svn at pcbsd.org
Fri Sep 19 07:10:42 PDT 2008


Author: kris
Date: 2008-09-19 07:10:42 -0700 (Fri, 19 Sep 2008)
New Revision: 2800

Removed:
   pcbsd/branches/7.0/InstallLang/
Modified:
   pcbsd/branches/7.0/CrashHandler/CrashHandler.pro
   pcbsd/branches/7.0/PBIdelete/PBIdelete.pro
   pcbsd/branches/7.0/PBReg/PBReg.pro
   pcbsd/branches/7.0/SoundError/SoundError.pro
   pcbsd/branches/7.0/ethernetconfig/ethernetconfig.pro
   pcbsd/branches/7.0/kcmPBMsource/PBM.pro
Log:

Do the same for the 7.0 branch, fixed up various sources to compile properly when kde3 libs are installed



Modified: pcbsd/branches/7.0/CrashHandler/CrashHandler.pro
===================================================================
--- pcbsd/branches/7.0/CrashHandler/CrashHandler.pro	2008-09-19 14:08:11 UTC (rev 2799)
+++ pcbsd/branches/7.0/CrashHandler/CrashHandler.pro	2008-09-19 14:10:42 UTC (rev 2800)
@@ -22,3 +22,8 @@
 TRANSLATIONS = CrashHandler_en.ts
 
 QT +=qt3support
+
+INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+

Modified: pcbsd/branches/7.0/PBIdelete/PBIdelete.pro
===================================================================
--- pcbsd/branches/7.0/PBIdelete/PBIdelete.pro	2008-09-19 14:08:11 UTC (rev 2799)
+++ pcbsd/branches/7.0/PBIdelete/PBIdelete.pro	2008-09-19 14:10:42 UTC (rev 2800)
@@ -11,3 +11,8 @@
 
 
 QT +=qt3support
+
+INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+

Modified: pcbsd/branches/7.0/PBReg/PBReg.pro
===================================================================
--- pcbsd/branches/7.0/PBReg/PBReg.pro	2008-09-19 14:08:11 UTC (rev 2799)
+++ pcbsd/branches/7.0/PBReg/PBReg.pro	2008-09-19 14:10:42 UTC (rev 2800)
@@ -10,3 +10,8 @@
 FORMS	= pbreg.ui
 
 QT +=qt3support
+
+INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+

Modified: pcbsd/branches/7.0/SoundError/SoundError.pro
===================================================================
--- pcbsd/branches/7.0/SoundError/SoundError.pro	2008-09-19 14:08:11 UTC (rev 2799)
+++ pcbsd/branches/7.0/SoundError/SoundError.pro	2008-09-19 14:10:42 UTC (rev 2800)
@@ -3,8 +3,6 @@
 
 LIBS	+= -L/usr/local/kde4/lib -lkdeui -lkdecore -lkio
 
-INCLUDEPATH	+= /usr/local/kde4/include
-
 CONFIG	+= qt warn_on release
 
 TARGET=SoundError
@@ -20,3 +18,8 @@
 RESOURCES = SoundError.qrc
 
 TRANSLATIONS = SoundError_en.ts
+
+INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+

Modified: pcbsd/branches/7.0/ethernetconfig/ethernetconfig.pro
===================================================================
--- pcbsd/branches/7.0/ethernetconfig/ethernetconfig.pro	2008-09-19 14:08:11 UTC (rev 2799)
+++ pcbsd/branches/7.0/ethernetconfig/ethernetconfig.pro	2008-09-19 14:10:42 UTC (rev 2800)
@@ -5,8 +5,6 @@
 
 LIBS	+= -L/usr/local/kde4/lib -lkdeui -lkdecore -lkio -lpcbsd
 
-INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
-
 HEADERS += ethernetconfig.h 
 
 SOURCES	+= main.cpp \
@@ -23,3 +21,8 @@
 DESTDIR = /PCBSD/networkmanager/bin/
 
 QT += qt3support
+
+INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+

Modified: pcbsd/branches/7.0/kcmPBMsource/PBM.pro
===================================================================
--- pcbsd/branches/7.0/kcmPBMsource/PBM.pro	2008-09-19 14:08:11 UTC (rev 2799)
+++ pcbsd/branches/7.0/kcmPBMsource/PBM.pro	2008-09-19 14:10:42 UTC (rev 2800)
@@ -3,8 +3,6 @@
 
 CONFIG	+= qt warn_on release
 
-INCLUDEPATH += /usr/local/kde4/include
-
 LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
 HEADERS	+= kcm.h notroot.h pbm.h
@@ -26,3 +24,8 @@
 TRANSLATIONS = PBM_en_US.ts 
 
 QT +=  qt3support 
+
+INCLUDEPATH     += /PCBSD/includes /usr/local/kde4/include
+
+QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+



More information about the Commits mailing list