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/include_function/include_missing_file2.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/include_function/include_missing_file2.pro')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro b/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro index f013ae1a85..542b9ff516 100644 --- a/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro +++ b/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro @@ -1,4 +1,3 @@ # Specifying full set of parameters to include() to test that a warning # is shown for this non-existing file. include(missing_file.pri, "", false) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |