Ok, things should be working again. Note to select modules, you now have to

specify one of 'qtclient', 'core' or 'mono' or 'all' in BUILD.

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index f64daea..d51cf84 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -39,59 +39,10 @@ src/core/storage.cpp
 src/core/storage.h
 src/plugins
 src/plugins/plugin.h
 src/core/storage.h
 src/plugins
 src/plugins/plugin.h

-src/qtgui
-src/qtgui/bufferview.cpp
-src/qtgui/bufferviewfilter.cpp
-src/qtgui/bufferviewfilter.h
-src/qtgui/bufferview.h
-src/qtgui/bufferwidget.cpp
-src/qtgui/bufferwidget.h
-src/qtgui/channelwidgetinput.cpp
-src/qtgui/channelwidgetinput.h
-src/qtgui/chatline.cpp
-src/qtgui/chatline.h
-src/qtgui/chatwidget.cpp
-src/qtgui/chatwidget.h
-src/qtgui/coreconnectdlg.cpp
-src/qtgui/coreconnectdlg.h
-src/qtgui/identities.cpp
-src/qtgui/identities.h
-src/qtgui/mainwin.cpp
-src/qtgui/mainwin.h
-src/qtgui/qtgui.cpp
-src/qtgui/qtgui.h
-src/qtgui/serverlist.cpp
-src/qtgui/serverlist.h
-src/qtgui/settingsdlg.cpp
-src/qtgui/settingsdlg.h
-src/qtgui/settingspages.cpp
-src/qtgui/settingspages.h
-src/qtgui/style.cpp
-src/qtgui/style.h
-src/qtgui/tabcompleter.cpp
-src/qtgui/tabcompleter.h
-src/qtgui/ui
-src/qtgui/ui/aboutdlg.ui
-src/qtgui/ui/bufferviewwidget.ui
-src/qtgui/ui/bufferwidget.ui
-src/qtgui/ui/channelwidget.ui
-src/qtgui/ui/coreconnectdlg.ui
-src/qtgui/ui/coresettingspage.ui
-src/qtgui/ui/identitiesdlg.ui
-src/qtgui/ui/identitieseditdlg.ui
-src/qtgui/ui/mainwin.ui
-src/qtgui/ui/networkeditdlg.ui
-src/qtgui/ui/nickeditdlg.ui
-src/qtgui/ui/servereditdlg.ui
-src/qtgui/ui/serverlistdlg.ui
-src/qtgui/ui/settingsdlg.ui

 src/client/clientsettings.h
 src/client/clientsettings.cpp
 src/client/clientsettings.h
 src/client/clientsettings.cpp

-src/qtgui/guisettings.h
-src/qtgui/guisettings.cpp

 src/common/ircuser.h
 src/common/ircuser.cpp
 src/common/ircuser.h
 src/common/ircuser.cpp

-src/qtgui/settingspage.h

 src/contrib
 src/contrib/qxt
 src/contrib/qxt/qxtglobal.h
 src/contrib
 src/contrib/qxt
 src/contrib/qxt/qxtglobal.h


@@ -133,7 +84,6 @@ src/qtopia/chatline.h
 src/qtopia/chatwidget.cpp
 src/qtopia/chatwidget.h
 src/qtopia/qtopia.pri
 src/qtopia/chatwidget.cpp
 src/qtopia/chatwidget.h
 src/qtopia/qtopia.pri

-src/qtgui/qtgui.pri

 src/core/core.pri
 src/contrib/qxt/qxt.pri
 src/common/common.pri
 src/core/core.pri
 src/contrib/qxt/qxt.pri
 src/common/common.pri

diff --git a/build/quassel.pro b/build/quassel.pro
index 5be5fde..a2de999 100644 (file)
--- a/build/quassel.pro
+++ b/build/quassel.pro
@@ -26,7 +26,7 @@ isEmpty(BUILD) {
 }
 
 contains(BUILD, all) {
 }
 
 contains(BUILD, all) {

-  BUILD += qtgui core mono
+  BUILD += qtclient core mono

 }
 
 contains(BUILD, mono) {
 }
 
 contains(BUILD, mono) {


@@ -41,10 +41,10 @@ contains(BUILD, core) {
   BUILD_TARGETS *= core
 }
 
   BUILD_TARGETS *= core
 }
 

-contains(BUILD, qtgui) {
-  include(targets/qtgui.pri)
+contains(BUILD, qtclient) {
+  include(targets/qtclient.pri)

   BUILD_MODS *= $${MODULES}
   BUILD_MODS *= $${MODULES}

-  BUILD_TARGETS *= qtgui
+  BUILD_TARGETS *= qtclient

 }
 
 # Now, we first build all needed modules...
 }
 
 # Now, we first build all needed modules...

diff --git a/build/targets/qtgui.pro b/build/targets/qtclient.pro
similarity index 69%
rename from build/targets/qtgui.pro
rename to build/targets/qtclient.pro
index 6fc1030..21805d0 100644 (file)
--- a/build/targets/qtgui.pro
+++ b/build/targets/qtclient.pro
@@ -1,4 +1,4 @@
-include(qtgui.pri)
+include(qtclient.pri)

 include(target.pri)
 
 TRANSLATIONS = quassel_de.ts
 include(target.pri)
 
 TRANSLATIONS = quassel_de.ts