Make QuasselTopia build again. Just run 'qtopiamake && make' in qtopia-build/

diff --git a/qtopia-build/quasseltopia.pro b/qtopia-build/quasseltopia.pro
index 62d0d60..f571ef7 100644 (file)
--- a/qtopia-build/quasseltopia.pro
+++ b/qtopia-build/quasseltopia.pro
@@ -7,11 +7,16 @@ CONFIG+=debug qtopia_main no_quicklaunch
 INCLUDEPATH+=../src/qtopia ../src/client ../src/common ../src/contrib/qxt
 
 
-# Include .pro from src dirs
-include(../src/contrib/qxt/qxt.pro)
-include(../src/common/common.pro)
-include(../src/qtopia/qtopia.pro)
-include(../src/client/client.pro)
+# Include .pri from src dirs
+include(../src/contrib/qxt/qxt.pri)
+include(../src/common/common.pri)
+include(../src/qtopia/qtopia.pri)
+include(../src/client/client.pri)
+
+# Fix variable names
+SOURCES = $$SRCS
+HEADERS = $$HDRS
+FORMS   = $$FRMS
 
 # SXE permissions required
 #pkg.domain=none

diff --git a/src/client/client.pri b/src/client/client.pri
index 1b2148a..930b8f7 100644 (file)
--- a/src/client/client.pri
+++ b/src/client/client.pri
@@ -1,4 +1,4 @@
 DEPMOD = common contrib/qxt
 QT_MOD = core network gui   # gui is needed just for QColor... FIXME!
-SRCS = buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp
-HDRS = buffer.h buffertreemodel.h client.h clientsettings.h treemodel.h
+SRCS += buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp
+HDRS += buffer.h buffertreemodel.h client.h clientsettings.h treemodel.h

diff --git a/src/common/common.pri b/src/common/common.pri
index f1360f9..3dd80ef 100644 (file)
--- a/src/common/common.pri
+++ b/src/common/common.pri
@@ -1,4 +1,4 @@
 DEPMOD = contrib/qxt
 QT_MOD = network
-SRCS = global.cpp ircuser.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp
-HDRS = global.h ircuser.h logger.h message.h quasselui.h settings.h signalproxy.h util.h
+SRCS += global.cpp ircuser.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp
+HDRS += global.h ircuser.h logger.h message.h quasselui.h settings.h signalproxy.h util.h

diff --git a/src/contrib/qxt/qxt.pri b/src/contrib/qxt/qxt.pri
index 0fdc081..fa68783 100644 (file)
--- a/src/contrib/qxt/qxt.pri
+++ b/src/contrib/qxt/qxt.pri
@@ -1,5 +1,4 @@
 DEPMOD =
 QT_MOD = core network
-SRCS = qxtmetaobject.cpp qxtnull.cpp qxtrpcpeer.cpp
-HDRS = qxtboundfunction.h qxtboundfunctionbase.h qxtglobal.h qxtmetaobject.h qxtnullable.h qxtnull.h qxtpimpl.h qxtrpcpeer.h
-FRMS =
+SRCS += qxtmetaobject.cpp qxtnull.cpp qxtrpcpeer.cpp
+HDRS += qxtboundfunction.h qxtboundfunctionbase.h qxtglobal.h qxtmetaobject.h qxtnullable.h qxtnull.h qxtpimpl.h qxtrpcpeer.h

diff --git a/src/qtgui/qtgui.pri b/src/qtgui/qtgui.pri
index 699a63d..c8dd0f8 100644 (file)
--- a/src/qtgui/qtgui.pri
+++ b/src/qtgui/qtgui.pri
@@ -1,11 +1,11 @@
 DEPMOD = common client contrib/qxt
 QT_MOD = core gui network
 
-SRCS = bufferview.cpp bufferviewfilter.cpp bufferwidget.cpp channelwidgetinput.cpp chatline.cpp \
+SRCS += bufferview.cpp bufferviewfilter.cpp bufferwidget.cpp channelwidgetinput.cpp chatline.cpp \
        chatwidget.cpp coreconnectdlg.cpp \
        guisettings.cpp identities.cpp mainwin.cpp qtgui.cpp serverlist.cpp settingsdlg.cpp style.cpp tabcompleter.cpp
 
-HDRS = bufferview.h bufferviewfilter.h bufferwidget.h channelwidgetinput.h chatline.h chatwidget.h coreconnectdlg.h \
+HDRS += bufferview.h bufferviewfilter.h bufferwidget.h channelwidgetinput.h chatline.h chatwidget.h coreconnectdlg.h \
        guisettings.h identities.h mainwin.h qtgui.h serverlist.h settingsdlg.h settingspage.h style.h tabcompleter.h
 
 

diff --git a/src/qtopia/qtopia.pri b/src/qtopia/qtopia.pri
new file mode 100644 (file)
index 0000000..7e00cc4
--- /dev/null
+++ b/src/qtopia/qtopia.pri
@@ -0,0 +1,4 @@
+# Input
+HDRS += chatline.h chatwidget.h coreconnectdlg.h mainwidget.h qtopiagui.h qtopiamainwin.h topicbar.h
+SRCS += chatline.cpp chatwidget.cpp coreconnectdlg.cpp mainwidget.cpp qtopiagui.cpp qtopiamainwin.cpp main.cpp topicbar.cpp
+FRMS += ui/coreconnectdlg.ui ui/coreconnectprogressdlg.ui ui/editcoreacctdlg.ui ui/mainwidget.ui