Merging r780:797 from trunk to branches/0.3.

[quassel.git] / src / qtui / qtui.pri

diff --git a/src/qtui/qtui.pri b/src/qtui/qtui.pri
index ba6182a..7f01d41 100644 (file)
--- a/src/qtui/qtui.pri
+++ b/src/qtui/qtui.pri
@@ -1,18 +1,27 @@
-DEPMOD = uisupport common client
+DEPMOD = client common uisupport
 QT_MOD = core gui network
 
-SRCS += bufferwidget.cpp chatline-old.cpp \
-        chatwidget.cpp coreconnectdlg.cpp configwizard.cpp \
-        guisettings.cpp identities.cpp mainwin.cpp nicklistwidget.cpp qtui.cpp qtuistyle.cpp serverlist.cpp settingsdlg.cpp \
-        topicwidget.cpp debugconsole.cpp inputwidget.cpp verticaldock.cpp
+SRCS += aboutdlg.cpp bufferwidget.cpp chatline-old.cpp chatwidget.cpp \
+        coreconfigwizard.cpp coreconnectdlg.cpp configwizard.cpp debugconsole.cpp inputwidget.cpp \
+        mainwin.cpp nicklistwidget.cpp qtui.cpp qtuisettings.cpp qtuistyle.cpp settingsdlg.cpp settingspagedlg.cpp \
+        titlesetter.cpp topicbutton.cpp topicwidget.cpp verticaldock.cpp jumpkeyhandler.cpp
 
-HDRS += bufferwidget.h chatline-old.h chatwidget.h configwizard.h \
-        coreconnectdlg.h guisettings.h identities.h mainwin.h nicklistwidget.h qtui.h qtuistyle.h serverlist.h settingsdlg.h \
-        topicwidget.h debugconsole.h inputwidget.h verticaldock.h
+HDRS += aboutdlg.h bufferwidget.h chatline-old.h chatwidget.h \
+        coreconfigwizard.h configwizard.h debugconsole.h inputwidget.h \
+        coreconnectdlg.h mainwin.h nicklistwidget.h qtui.h qtuisettings.h qtuistyle.h settingsdlg.h settingspagedlg.h \
+        titlesetter.h topicbutton.h topicwidget.h verticaldock.h jumpkeyhandler.h
 
-FORMNAMES = identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui nickeditdlg.ui serverlistdlg.ui \
-            servereditdlg.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \
-            topicwidget.ui debugconsole.ui inputwidget.ui
+# new chatline model stuff
+sputdev {
+  SRCS += chatitem.cpp chatline.cpp chatlinemodel.cpp chatscene.cpp chatview.cpp
+  HDRS += chatitem.h chatline.h chatlinemodel.h chatscene.h chatview.h
+  SRCS -= chatline-old.cpp chatwidget.cpp
+  HDRS -= chatline-old.h chatwidget.h
+}
+
+FORMNAMES = aboutdlg.ui mainwin.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \
+            settingspagedlg.ui topicwidget.ui debugconsole.ui inputwidget.ui \
+            coreconfigwizardintropage.ui coreconfigwizardadminuserpage.ui coreconfigwizardstorageselectionpage.ui coreconfigwizardsyncpage.ui
 
 for(ui, FORMNAMES) {
   FRMS += ui/$${ui}