diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:48:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:48:24 +0200 |
| commit | f1be89afbfbc876fea858a10278fc58387c50533 (patch) | |
| tree | 251e5a62af6618d6512f01e6c12f3f22bf54d264 /tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete | |
| parent | 9d3cbd0a5fe7fea1c830a82df52ffcf88352a1ab (diff) | |
| parent | 90d59cb8ca0428ef048aa17d0e9d92acc0424ee8 (diff) | |
| download | qttools-f1be89afbfbc876fea858a10278fc58387c50533.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/linguist/lupdate/cpp.cpp
Change-Id: Id27ac2ea8438e60a940d4ae3719ad393d7ad88ea
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro index 6667df7f4..63f5d66e2 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro @@ -1,4 +1,3 @@ SOURCES += finddialog.cpp TRANSLATIONS = project.ts -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |