Go to file
Robin Burchell 9fbfddfe8a Merge integrity support into unix.
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>
2012-01-02 18:19:36 +01:00
bin fixqt4headers: Add QtCore to folders (for moved item models). 2011-12-20 16:18:27 +01:00
config.tests Fix fvisibility.test for "QMAKE_CXX = ccache g++" 2011-12-18 19:12:42 +01:00
dist Change the default value of QSortFilterProxyModel::dynamicSortFilter 2012-01-02 16:43:02 +01:00
doc/src Move snippets from qtdoc. 2011-12-06 22:29:01 +01:00
examples Change the default value of QSortFilterProxyModel::dynamicSortFilter 2012-01-02 16:43:02 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Fix cmake files for static builds. 2011-12-23 17:35:33 +01:00
qmake Remove unused -DQT_NO_PCRE from qmake makefiles 2011-12-23 21:24:25 +01:00
src Merge integrity support into unix. 2012-01-02 18:19:36 +01:00
tests Change the default value of QSortFilterProxyModel::dynamicSortFilter 2012-01-02 16:43:02 +01:00
tools Finish removing Qt3 support 2011-12-23 11:59:11 +01:00
util Fix up the accessibility inspector. 2011-12-22 00:47:03 +01:00
.gitattributes Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
.gitignore Add V8 snapshot support 2011-11-22 13:10:56 +01:00
.gitmodules Add QtV8 library to QtBase 2011-08-29 10:16:01 +02:00
.tag Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
configure Finish removing Qt3 support 2011-12-23 11:59:11 +01:00
configure.exe Rebuild configure.exe. 2011-12-21 22:58:56 +01:00
header.BSD Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
header.FDL Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
header.LGPL Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
header.LGPL-ONLY Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
INSTALL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LGPL_EXCEPTION.txt Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.LGPL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.PREVIEW.COMMERCIAL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qtbase.pro Ensure qmodule.pri is installed. 2011-11-23 00:12:03 +01:00
sync.profile Fix source incompatibility for QVariant{Map, Hash, List} 2011-11-14 18:41:17 +01:00