diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-03 13:33:34 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-03 13:33:34 +0200 |
| commit | 5e05bafa229b645bf30a90975bfc57e458e081e5 (patch) | |
| tree | 54606401f955891574cbcc589ae2558cb2a5b748 /tests/auto/qmake | |
| parent | 128717b171f01c82e5f0fb83f5923d4f7b9cfc10 (diff) | |
| parent | 463df7e4a6dc7c11716e27ca5de9ebeb61940990 (diff) | |
Merge branch '4.5'
Conflicts:
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/dialogs/qcolordialog.cpp
src/gui/painting/qwindowsurface_raster.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qsharedpointer/externaltests.cpp
Diffstat (limited to 'tests/auto/qmake')
| -rw-r--r-- | tests/auto/qmake/testdata/simple_app_build/README | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qmake/testdata/simple_app_build/README b/tests/auto/qmake/testdata/simple_app_build/README new file mode 100644 index 0000000000..81dc596e5b --- /dev/null +++ b/tests/auto/qmake/testdata/simple_app_build/README @@ -0,0 +1 @@ +Placeholder file to ensure this directory exists |