[Regression] QDirIterator returns hidden directories when it should only return files and returns hidden files when it should only return directories

#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
#include <QtCore/QDirIterator>
#include <QtCore/QFileInfo>
#include <QtCore/QString>
#include <stdio.h>

int main(int argc, char **argv)
{
    printf("Testing using Qt version %s\n", QT_VERSION_STR);

    QCoreApplication app(argc, argv);

    QStringList args = app.arguments();
    args.takeFirst();           // the executable name

    if (args.count() < 1) {
        printf("Usage: test <dirname>\n");
        return 1;
    }

    QDir qtdir = args.takeFirst();

    if (!qtdir.exists()) {
        printf("Directory %s does not exist", qPrintable(qtdir.path()));
        return 1;
    }

    qtdir.makeAbsolute();

    {
        printf("Performing file search test...\n");
        int matches = 0;
        int failures = 0;
        QDirIterator di(qtdir.path(), QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
        while (di.hasNext()) {
            ++matches;
            QString filename = di.next();
            if (QFileInfo(filename).isDir()) {
                printf("\tSearch returned directory %s\n", qPrintable(filename));
                ++failures;    // search was only supposed to find files
            }
        }
        printf("Search returned %d items, %d of which weren't files.\n", matches, failures);
        printf("File search test result: %s.\n", failures ? "Fail" : "Pass" );
    }

    {
        printf("Performing directory search test...\n");
        int matches = 0;
        int failures = 0;
        QDirIterator di(qtdir.path(), QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
        while (di.hasNext()) {
            ++matches;
            QString filename = di.next();
            if (!QFileInfo(filename).isDir()) {
                printf("\tSearch returned file %s\n", qPrintable(filename));
                ++failures;    // search was only supposed to find files
            }
        }
        printf("Search returned %d items, %d of which weren't directories.\n", matches, failures);
        printf("Directory search test result: %s.\n", failures ? "Fail" : "Pass" );
    }

    return 0;
}

user@host:~/test$ (make clean && qmake && make) >> /dev/null && ./test ~/depot/qt-releases
Testing using Qt version 4.5.3
Performing file search test...
Search returned 43355 items, 0 of which weren't files.
File search test result: Pass.
Performing directory search test...
Search returned 4482 items, 0 of which weren't directories.
Directory search test result: Pass.

user@host:~/test$ (make clean && qmake && make) >> /dev/null && ./test ~/depot/qt-releases
Testing using Qt version 4.6.0
Performing file search test...
        Search returned directory /home/user/depot/qt-releases/.git
Search returned 43356 items, 1 of which weren't files.
File search test result: Fail.
Performing directory search test...
        Search returned file /home/user/depot/qt-releases/.gitignore
...
Search returned 5012 items, 530 of which weren't directories.
Directory search test result: Fail.