Go to file
Laszlo Agocs 376ccedd1a Avoid incorrect warning when painting onto a QImage
Change Ia8ef48f3 introduced a regression: Trying to paint onto a
QImage, QPicture or QPrinter from outside the main thread incorrectly
shows a warning saying that it is not supported.

The patch was incorrect because 'extraCondition' was used in the
non-default branches of the switch and thus not passing
extraCondition==true caused the message appear even when it shouldn't
have.

Let's just remove the extraCondition parameter altogether since it is
not used in practice anyway.

Change-Id: Id2e56c585d1f1013f24942cbcd53305fbb66aeba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2013-11-23 15:44:55 +01: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 Handle INCLUDE and LIB environment variables in config.tests for MinGW 2013-11-22 07:30:57 +01:00
dist Doc: document QCoreApplication::arguments() behavior fix in Windows 2013-11-14 21:15:35 +01:00
doc Update the list of examples that work on Android. 2013-11-21 11:02:37 +01:00
examples Doc: Fix broken links 2013-11-05 00:29:01 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs fix header bundling in some framework builds 2013-11-15 06:32:12 +01:00
qmake install pdb files for dlltarget 2013-11-21 14:53:30 +01:00
src Avoid incorrect warning when painting onto a QImage 2013-11-23 15:44:55 +01:00
tests Revert "Ensure Qt::WA_Mapped is set in case of obscured native windows." 2013-11-21 16:28:36 +01:00
tools don't automatically display help on error 2013-11-20 08:03:59 +01:00
util generate qfeatures.h at build time 2013-10-29 15:37:58 +01: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 Enable -Werror for all of qtbase 2013-09-04 01:50:10 +02:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure clean up mess surrounding PLATFORM_MAC 2013-11-20 12:40:06 +01: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 de-duplicate QT_DISABLED_FEATURES after resolving dependencies 2013-11-04 19:49:48 +01:00
sync.profile generate qfeatures.h at build time 2013-10-29 15:37:58 +01:00