diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2016-01-24 18:10:25 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2016-01-24 18:10:25 +0000 |
| commit | 0e9a86ebfc1a97742d0812a7b6ae8bb7f4662673 (patch) | |
| tree | f900f46ac4f14f8635533279bd434b06e6f3a94e /qt5_4.imp | |
| parent | e90fbb1df211513ee2176aee136fbc387750bbc2 (diff) | |
| parent | 8da9ba5404f51521b3425b6213e8139189dbca69 (diff) | |
Merge branch 'master' into issue/418
# Conflicts:
# SConstruct
# src/organizerproxy.cpp
Diffstat (limited to 'qt5_4.imp')
| -rw-r--r-- | qt5_4.imp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2463,7 +2463,7 @@ { include: [ "@\"(QtCore/)?qglobal\\.h\"", "private", "<QtGlobal>", "public" ] }, { include: [ "@\"(QtCore/)?qnamespace\\.h\"", "private", "<Qt>", "public" ] }, { include: [ "@\"(QtCore/)?qlogging\\.h\"", "private", "<QtDebug>", "public" ] }, #qDebug, qWarning, etc - { include: [ "@\"(QtCore/)?qalgorithms\\.h\"", "private", "<QAlgorithms>", "public" ] }, #qSort, etc + { include: [ "@\"(QtCore/)?qalgorithms\\.h\"", "private", "<QtAlgorithms>", "public" ] }, #qSort, etc { include: [ "@\"(QtWinExtras/)?qwinfunctions\\.h\"", "private", "<QtWin>", "public" ] }, # for fromHICON # These ones are just madness. For instance, why with the above do we get |