From 4f8c71d62626aa61fb4d13f80bc043d5e6492c3e Mon Sep 17 00:00:00 2001 From: Tannin Date: Fri, 12 Feb 2016 19:08:25 +0100 Subject: merged master into new_vfs_library --- qt5_4.imp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt5_4.imp') diff --git a/qt5_4.imp b/qt5_4.imp index 22553b0e..5f919085 100644 --- a/qt5_4.imp +++ b/qt5_4.imp @@ -2463,7 +2463,7 @@ { include: [ "@\"(QtCore/)?qglobal\\.h\"", "private", "", "public" ] }, { include: [ "@\"(QtCore/)?qnamespace\\.h\"", "private", "", "public" ] }, { include: [ "@\"(QtCore/)?qlogging\\.h\"", "private", "", "public" ] }, #qDebug, qWarning, etc - { include: [ "@\"(QtCore/)?qalgorithms\\.h\"", "private", "", "public" ] }, #qSort, etc + { include: [ "@\"(QtCore/)?qalgorithms\\.h\"", "private", "", "public" ] }, #qSort, etc { include: [ "@\"(QtWinExtras/)?qwinfunctions\\.h\"", "private", "", "public" ] }, # for fromHICON # These ones are just madness. For instance, why with the above do we get -- cgit v1.3.1