diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-12-02 21:43:06 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-12-03 09:11:39 +0100 |
| commit | adfb07d0492c882a53aef6e36f3d339651fd48d4 (patch) | |
| tree | 1650a59cf55596e0b3d5237b5f31524513e7de82 /src/libs/aggregation | |
| parent | ac9c649bef826c770e25b92c50ba19891912df44 (diff) | |
Aggregation: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Id2e6edb66dbc6afb3647ff94af08fb9246f11b08
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/libs/aggregation')
| -rw-r--r-- | src/libs/aggregation/aggregation.pro | 2 | ||||
| -rw-r--r-- | src/libs/aggregation/aggregation.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/aggregation/aggregation.pro b/src/libs/aggregation/aggregation.pro index b601bbc061..2ed325667a 100644 --- a/src/libs/aggregation/aggregation.pro +++ b/src/libs/aggregation/aggregation.pro @@ -3,7 +3,7 @@ TARGET = Aggregation include(../../qtcreatorlibrary.pri) -DEFINES += AGGREGATION_LIBRARY +DEFINES += AGGREGATION_LIBRARY QT_NO_CAST_FROM_ASCII HEADERS = aggregate.h \ aggregation_global.h diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs index a5e8e84d39..63896d40e7 100644 --- a/src/libs/aggregation/aggregation.qbs +++ b/src/libs/aggregation/aggregation.qbs @@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary QtcLibrary { name: "Aggregation" - cpp.defines: base.concat("AGGREGATION_LIBRARY") + cpp.defines: base.concat(["AGGREGATION_LIBRARY", "QT_NO_CAST_FROM_ASCII"]) Depends { name: "cpp" } Depends { name: "Qt.core" } |