diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-11-03 11:29:14 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-11-03 11:29:14 +0100 |
| commit | 8821b89c074b5901c6a2dc3b3756cd9531698ca7 (patch) | |
| tree | 0c9058169127a9728b6664e914b77d63896b7f6f /src/lib/qtprofilesetup/templates | |
| parent | 4b736ac6bd882d0d09ecb0de31faa03b089fe2dc (diff) | |
| parent | 0d1b18c7ad5bbfe4507f33d5f726b46f39d08677 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
tests/auto/api/tst_api.h
Change-Id: I1f9cb9105f4ed2c428729810b7a7079d11e90957
Diffstat (limited to 'src/lib/qtprofilesetup/templates')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index dbe16e02b..44a67dffd 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -75,9 +75,6 @@ Module { property string generatedFilesDir: product.buildDirectory + "/GeneratedFiles" property string qmFilesDir: product.destinationDirectory - // private properties - property string libraryInfix: cpp.debugInformation ? 'd' : '' - cpp.defines: { var defines = @defines@; // ### QT_NO_DEBUG must be added if the current build variant is derived |