pidgin/quail/quail

Resolve merge
soc.2013.phil.quail
2013-07-01, Phil Hannent
c6d0ee53e238
Parents c4d3373fc63c
Children 87bc001209e9
Resolve merge
1 files changed, 81 insertions(+), 77 deletions(-)
  • +81 -77
    quail.pro
    • --- a/quail.pro Sat Jun 29 07:55:53 2013 +0100
    +++ b/quail.pro Mon Jul 01 09:43:20 2013 +0100
    @@ -1,77 +1,81 @@
    -DEFINES += APP_NAME=\\\"Quail\\\"
    -
    -win32 {
    - DEFINES += BUILDTIME=\\\"$$system('time/T')\\\"
    - DEFINES += BUILDDATE=\\\"$$system('echo %date%')\\\"
    -}
    -else {
    - DEFINES += BUILDTIME=\\\"$$system(date '+%H:%M.%s')\\\"
    - DEFINES += BUILDDATE=\\\"$$system(date '+%d/%m/%y')\\\"
    -}
    -
    -QT += core gui
    -
    -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    -
    -TARGET = quail
    -TEMPLATE = app
    -
    -SOURCES += main.cpp\
    - mainwindow.cpp \
    - conversationwindow.cpp \
    - debugwindow.cpp \
    - accountswindow.cpp \
    - accountwindow.cpp \
    - joinachatwindow.cpp \
    - conferenceserverwindow.cpp \
    - roomlistwindow.cpp \
    - buddyinfowindow.cpp \
    - aboutwindow.cpp
    -
    -HEADERS += mainwindow.h \
    - conversationwindow.h \
    - debugwindow.h \
    - accountswindow.h \
    - accountwindow.h \
    - joinachatwindow.h \
    - conferenceserverwindow.h \
    - roomlistwindow.h \
    - buddyinfowindow.h \
    - aboutwindow.h
    -
    -FORMS += mainwindow.ui \
    - conversationwindow.ui \
    - debugwindow.ui \
    - accountswindow.ui \
    - accountwindow.ui \
    - joinachatwindow.ui \
    - conferenceserverwindow.ui \
    - roomlistwindow.ui \
    - buddyinfowindow.ui \
    - aboutwindow.ui
    -
    -unix {
    - INCLUDEPATH += /usr/include/glib-2.0 \
    - /usr/lib/glib-2.0/include \
    - /usr/include/libpurple \
    - ../pidgin-main/libpurple \
    - /usr/lib/x86_64-linux-gnu/glib-2.0/include/
    - LIBS += -L"../qpurple/"
    -}
    -win32 {
    - INCLUDEPATH += /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    - /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    - /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    - /cygdrive/c/dev/pidgin-main/libpurple
    -
    - INCLUDEPATH += c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    - c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    - C:/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    - c:/dev/pidgin-main/libpurple
    -
    -
    - LIBS += -L"C:\dev\win32-dev\gtk-2.24.10\lib"
    - LIBS += -L"C:\dev\pidgin-main\libpurple"
    -}
    -
    -LIBS += -lqpurple
    +DEFINES += APP_NAME=\\\"Quail\\\"
    +
    +# Check that we have the repository folder
    +exists(.hg):DEFINES += BUILDREVISION=\\\"$$system( hg parent --template \"{node}\")\\\"
    +else:DEFINES += BUILDREVISION=\\\"NOTBUILTFROMSOURCEREPOSITORY\\\"
    +
    +win32 {
    + DEFINES += BUILDTIME=\\\"$$system('time/T')\\\"
    + DEFINES += BUILDDATE=\\\"$$system('echo %date%')\\\"
    +}
    +else {
    + DEFINES += BUILDTIME=\\\"$$system(date '+%H:%M.%s')\\\"
    + DEFINES += BUILDDATE=\\\"$$system(date '+%d/%m/%y')\\\"
    +}
    +
    +QT += core gui
    +
    +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    +
    +TARGET = quail
    +TEMPLATE = app
    +
    +SOURCES += main.cpp\
    + mainwindow.cpp \
    + conversationwindow.cpp \
    + debugwindow.cpp \
    + accountswindow.cpp \
    + accountwindow.cpp \
    + joinachatwindow.cpp \
    + conferenceserverwindow.cpp \
    + roomlistwindow.cpp \
    + buddyinfowindow.cpp
    +
    +HEADERS += mainwindow.h \
    + conversationwindow.h \
    + debugwindow.h \
    + accountswindow.h \
    + accountwindow.h \
    + joinachatwindow.h \
    + conferenceserverwindow.h \
    + roomlistwindow.h \
    + buddyinfowindow.h
    +
    +FORMS += mainwindow.ui \
    + conversationwindow.ui \
    + debugwindow.ui \
    + accountswindow.ui \
    + accountwindow.ui \
    + joinachatwindow.ui \
    + conferenceserverwindow.ui \
    + roomlistwindow.ui \
    + buddyinfowindow.ui
    +
    +unix {
    + INCLUDEPATH += /usr/include/glib-2.0 \
    + /usr/lib/glib-2.0/include \
    + /usr/include/libpurple \
    + ../pidgin-main/libpurple \
    + /usr/lib/x86_64-linux-gnu/glib-2.0/include/
    + LIBS += -L"../qpurple/"
    +}
    +win32 {
    + INCLUDEPATH += /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    + /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    + /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    + /cygdrive/c/dev/pidgin-main/libpurple
    +
    + INCLUDEPATH += c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    + c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    + C:/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    + c:/dev/pidgin-main/libpurple
    +
    +
    + LIBS += -L"C:\dev\win32-dev\gtk-2.24.10\lib"
    + LIBS += -L"C:\dev\pidgin-main\libpurple"
    +}
    +
    +LIBS += -lqpurple
    +
    +RESOURCES += \
    + quail.qrc