diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 15:14:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-11 16:42:01 +0200 |
| commit | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (patch) | |
| tree | 14810e4d0168c0cc3d69cb286574bf28375c07bc /tests/auto/tools/qmake/testdata/install_depends/foo.pro | |
| parent | b06304e164ba47351fa292662c1e6383c081b5ca (diff) | |
| parent | 7b9d6cf844ece18fef884f51117e25ad4ac31db5 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/json/qjsonwriter.cpp
src/corelib/kernel/qeventdispatcher_blackberry.cpp
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
Diffstat (limited to 'tests/auto/tools/qmake/testdata/install_depends/foo.pro')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/install_depends/foo.pro | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/tools/qmake/testdata/install_depends/foo.pro b/tests/auto/tools/qmake/testdata/install_depends/foo.pro index d6d424671a..22180d3429 100644 --- a/tests/auto/tools/qmake/testdata/install_depends/foo.pro +++ b/tests/auto/tools/qmake/testdata/install_depends/foo.pro @@ -18,7 +18,3 @@ INSTALLS+=test2 target.path=dist target.depends=install_test1 install_test2 INSTALLS+=target - - - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |