Merge overloads
authorRichard Moore <rich@kde.org>
Sun, 19 Feb 2012 15:55:29 +0000 (15:55 +0000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 21 Feb 2012 23:07:31 +0000 (00:07 +0100)
commit28401bf747d8ca81c9fe3179e8e59f779828a4a3
tree5325c62e6f05f69a78b79880fa8d5509e5b8fad9
parent5f5f9f33be4f21cdf925482898042bb792d53a78
Merge overloads

Fixes ### Qt 5

Change-Id: I2846593616635440e17c8a9ce518780561992b84
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/corelib/io/qfile.cpp
src/corelib/io/qfile.h