Changeset 396:cd04e09e16e5 in SMSSender


Ignore:
Timestamp:
Apr 30, 2014 6:19:06 PM (4 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
default
Children:
397:0e739edbec79, 399:f89a0033c4fd
Parents:
314:d3a7a7858268 (diff), 395:7573fe0113fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Tags:
3.1
Message:
  • Merges the frontend-backend separation branch back in.
Files:
498 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • gateways/ETHZ/ethz.pro

    r256 r396  
    1 BASE_VERSION = 1.0
    2 !include(../gateways.pri):!include(/usr/include/smssender/gateways.pri):error("Could not include gateways.pri")
    3 TARGET = ETHZ
    4 include(locale/locale.pri)
    5 HEADERS += src/business/bcaccount.h \
    6     src/business/bcaccount_tasks.h \
    7     src/business/bcgateway.h \
    8     src/business/contactimporter/bccontactimporter.h \
    9     src/business/contactimporter/bccontactimporter_p.h \
    10     src/business/validation/bcaccountvalidator.h \
    11     src/persistence/daaccountstorageofficer.h \
    12     src/ui/vcsettingswidget.h \
    13     src/library.h
    14 SOURCES += src/business/bcaccount.cpp \
    15     src/business/bcaccount_costs.cpp \
    16     src/business/bcaccount_task_login.cpp \
    17     src/business/bcaccount_task_sendsms.cpp \
    18     src/business/bcgateway.cpp \
    19     src/business/contactimporter/bccontactimporter.cpp \
    20     src/business/validation/bcaccountvalidator.cpp \
    21     src/persistence/daaccountstorageofficer.cpp \
    22     src/ui/vcsettingswidget.cpp \
    23     src/library.cpp
    24 FORMS += src/ui/vcsettingswidget.ui
    25 RESOURCES += lib/ethz.qrc
     1TEMPLATE = subdirs
     2
     3your-princess-is-in-another-castle {
     4    SUBDIRS = ethz-base
     5    ethz-base.file = ethz-base.pro
     6}
     7
     8build-frontend-gui {
     9    SUBDIRS += ethz-gui
     10    ethz-gui.file = gui/ethz-gui.pro
     11}
  • gateways/Sunrise/sunrise.pro

    r256 r396  
    1 BASE_VERSION = 2.0
    2 !include(../gateways.pri):!include(/usr/include/smssender/gateways.pri):error("Could not include gateways.pri")
    3 TARGET = Sunrise
    4 include(locale/locale.pri)
    5 HEADERS += src/business/contactimporter/bccontactimporter.h \
    6     src/business/bcaccount.h \
    7     src/business/bcaccount_tasks.h \
    8     src/business/bcgateway.h \
    9     src/business/bcnetworkhelper.h \
    10     src/persistence/daaccountstorageofficer.h \
    11     src/ui/vcsettingswidget.h \
    12     src/library.h
    13 SOURCES += src/business/contactimporter/bccontactimporter.cpp \
    14     src/business/bcaccount.cpp \
    15     src/business/bcaccount_costs.cpp \
    16     src/business/bcaccount_task_login.cpp \
    17     src/business/bcaccount_task_sendsms.cpp \
    18     src/business/bcgateway.cpp \
    19     src/business/bcnetworkhelper.cpp \
    20     src/persistence/daaccountstorageofficer.cpp \
    21     src/ui/vcsettingswidget.cpp \
    22     src/library.cpp
    23 FORMS += src/ui/vcsettingswidget.ui
    24 RESOURCES += lib/Sunrise.qrc
     1TEMPLATE = subdirs
     2
     3your-princess-is-in-another-castle {
     4    SUBDIRS = sunrise-base
     5    sunrise-base.file = sunrise-base.pro
     6}
     7
     8build-frontend-gui {
     9    SUBDIRS += sunrise-gui
     10    sunrise-gui.file = gui/sunrise-gui.pro
     11}
     12
Note: See TracChangeset for help on using the changeset viewer.