Changeset 437:87bda10047c7 in SMSSender


Ignore:
Timestamp:
May 13, 2014 9:40:39 AM (5 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
default
Parents:
429:e2b84a3d1a7d (diff), 436:f15770058f3c (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.
Message:
  • Merges the 3.2.* branch back in.
Files:
26 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • smssender.pri

    r429 r437  
    1818include(smssender.prf)
    1919
    20 BASE_VERSION = 3.3
     20VERSION = 3.3.0 # Always of the form major.minor.patch (e.g. 3.2.0)
     21DEVELOPMENT_VERSION = alpha0 # alpha1, beta0, rc2 (empty for release)
    2122
    22 DEVELOPMENT_VERSION = 3 # 0=alpha; 1=beta; 2=rc; 3=release
    23 VERSION_REVISION = 0
    24 
    25 VERSION = $${BASE_VERSION}.$${DEVELOPMENT_VERSION}.$${VERSION_REVISION}
     23FULL_VERSION=$$VERSION
     24!isEmpty(DEVELOPMENT_VERSION) {
     25    FULL_VERSION=$${FULL_VERSION}~$${DEVELOPMENT_VERSION}
     26}
    2627
    2728QMAKE_CXXFLAGS *= \
     
    3334INCLUDEPATH *= $$PWD
    3435
     36LIB_PREFIX=lib
    3537LIB_SUFFIX=
    3638EXT_STATICLIB=a
    3739EXT_DYNAMICLIB=so
    3840win32 {
    39     VERSIONS = $$split(BASE_VERSION, ".")
     41    VERSIONS = $$split(VERSION, ".")
     42    LIB_PREFIX =
    4043    LIB_SUFFIX = $$member(VERSIONS, 0)
    4144    EXT_DYNAMICLIB=dll
     45       
     46        CONFIG -= console
    4247}
    4348
  • smssender.pri

    r424 r437  
    1818include(smssender.prf)
    1919
    20 VERSION = 3.2.1 # Always of the form major.minor.patch (e.g. 3.2.0)
    21 DEVELOPMENT_VERSION = # alpha1, beta0, rc2 (empty for release)
     20VERSION = 3.3.0 # Always of the form major.minor.patch (e.g. 3.2.0)
     21DEVELOPMENT_VERSION = alpha0 # alpha1, beta0, rc2 (empty for release)
    2222
    2323FULL_VERSION=$$VERSION
Note: See TracChangeset for help on using the changeset viewer.