diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 14:03:21 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 14:03:21 +0200 |
commit | 1866c13b7dd48aa0c6ede1cf7907a2640e9399f8 (patch) | |
tree | 0b61c2d801525228f4c5795795d1cdeb57b3edfa /tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro | |
parent | 5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (diff) | |
parent | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro')
-rw-r--r-- | tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro index c04ed05ff3..9abc3e9f26 100644 --- a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro +++ b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro @@ -11,5 +11,3 @@ MOC_DIR = tmp OBJECTS_DIR = tmp TARGET = simple_lib DESTDIR = ./ - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |