Go to file
Oswald Buddenhagen e0f2603f49 avoid deadlock in cache() during spec/cache loading
sync up; this doesn't actually do anything in qmake.

if we end up calling cache() from within the initialization of the base
context, we cannot wait for for the completion of that initialization
before we proceed, obviously.

Change-Id: If30c6f3665fe423e767373a8821c406b2f5e0eca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/b64b4431c20afd9e39c1463e736f998ef450688f)
2013-08-27 13:36:34 +02:00
bin Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable 2013-06-15 22:39:25 +02:00
config.tests Add x86 arch detection support for AVX512 and SHA instructions 2013-08-22 02:04:39 +02:00
dist QTreeView - allow users to control data in the treestructure 2013-08-07 14:01:23 +02:00
doc qdoc: Fix the qdoc \include command 2013-08-22 16:11:29 +02:00
examples Merge remote-tracking branch 'origin/stable' into dev 2013-08-21 11:03:18 +02:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Make sure deprecation warnings don't cause errors with -Werror 2013-08-27 03:50:58 +02:00
qmake avoid deadlock in cache() during spec/cache loading 2013-08-27 13:36:34 +02:00
src Add QJsonValue::toInt(). 2013-08-27 08:01:29 +02:00
tests Add QJsonValue::toInt(). 2013-08-27 08:01:29 +02:00
tools Merge remote-tracking branch 'origin/stable' into dev 2013-08-21 11:03:18 +02:00
util [1/2] Implement Unicode Normalization Form Quick Check (NF QC) 2013-08-13 03:51:07 +02:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Long live QCommandLineParser! 2013-08-24 21:33:39 +02:00
.qmake.conf bye-bye .qmake.cache 2013-08-12 19:01:45 +02:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev 2013-08-22 02:04:39 +02:00
configure.bat get rid of syncqt wrapper scripts 2013-05-13 21:54:48 +02:00
header.BSD Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.FDL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL-ONLY Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
INSTALL INSTALL: Fix URL of Installing Qt documentation 2013-04-11 16:09:07 +02:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL Add the LICENSE.GPL file to the module referenced from license headers 2012-05-20 22:41:08 +02:00
LICENSE.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
LICENSE.PREVIEW.COMMERCIAL Update LICENSE.PREVIEW.COMMERCIAL license 2013-06-03 20:04:26 +02:00
qtbase.pro Merge remote-tracking branch 'origin/stable' into dev 2013-06-27 13:06:38 +02:00
sync.profile put ANGLE includes in a QtANGLE subdir 2013-06-10 21:12:13 +02:00