AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integrity support into unix.

Browse Source 
Similarly to ec9ea7f3e8, the code in unix
(non-Linux/OS X) is actually the same as for integrity, so merge the
conditionals together to save duplication.

This should have the side-effect of unbreaking Qt 5 on integrity wrt
the new QStandardPaths introduction, which was not added to the integrity
block.

Change-Id: Ib512fa781f5ceb240069888ce6958c9af2990d37
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
This commit is contained in:
Robin Burchell 2011-12-27 18:28:21 +01:00 committed by Qt by Nokia
parent 5295aab4e6
commit 9fbfddfe8a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/io/io.pri
View File

@ -82,7 +82,7 @@ win32 {
SOURCES += io/qfilesystemengine_win.cpp
SOURCES += io/qfilesystemiterator_win.cpp
SOURCES += io/qstandardpaths_win.cpp
} else:unix {
} else:unix|integrity {
SOURCES += \
io/qfsfileengine_unix.cpp \
io/qfilesystemengine_unix.cpp \
@ -117,9 +117,4 @@ win32 {
}
}
}
integrity {
SOURCES += io/qfsfileengine_unix.cpp \
io/qfsfileengine_iterator.cpp \
io/qfilesystemengine_unix.cpp \
io/qfilesystemiterator_unix.cpp
}