whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Qt 6.8.3 with BlackBerry 10 (QNX 8 / ARMv7) patches
28,487 Commits
1 Branch
0 Tags
343 MiB
C++ 84%
HTML 5%
C 3.9%
CMake 3.4%
Objective-C++ 2%
Other 1.1%
 
 
 
 
 
 
Go to file
Edward Welbourne 6c5de416c9 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/corelib/io/qtemporarydir.cpp
One side encapsulated a repeated piece of #if-ery in a local define;
the other added to the #if-ery.  Made its addition to the other's.

	src/corelib/kernel/qeventdispatcher_unix_p.h
One side moved some members into a struct; this collided with a #undef
check that neither side now has.  Discarded the #undef part.

	src/gui/opengl/qopengltexturehelper_p.h
5.7 deleted a bunch of methods; not clear why merge got confused.

	src/tools/moc/moc.cpp
One added a name to the copyright header; another changed its URL.

Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa
 		2016-07-26 10:43:29 +02:00
bin Merge remote-tracking branch 'origin/5.6.0' into 5.7 2016-03-07 17:08:56 +01:00
config.tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
dist Add Qt 5.7.0 changelog 2016-06-10 06:48:56 +00:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
examples Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
lib Purge all fonts 2015-08-18 19:59:14 +00:00
mkspecs Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
qmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
src Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
tools move c++11 test into qcompilerdetection.h and make it stricter 2016-07-22 10:21:36 +00:00
util Re-generate QLocale data from CLDR v29 2016-04-08 03:51:18 +00:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Ignore more build artifacts from in-source builds. 2016-06-16 07:06:37 +00:00
.qmake.conf Bump version 2016-05-23 18:28:33 +00:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
INSTALL Doc: Update links in INSTALL file 2015-02-16 09:06:41 +00:00
LGPL_EXCEPTION.txt Update copyright headers 2015-02-11 06:49:51 +00:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL2 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3-EXCEPT Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.LGPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPLv21 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.PREVIEW.COMMERCIAL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
configure Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
configure.bat Don't compile configure.exe with clang-cl.exe if cl.exe is available 2016-07-21 00:16:04 +00:00
header.BSD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.BSD-OLD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.COMM Add header template for commercial only modules 2015-10-19 10:37:18 +00:00
header.FDL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.FDL-OLD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.GPL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.GPL-EXCEPT Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL-NOGPL2 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL-ONLY Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL3 Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL3-COMM Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL21 Update copyright headers 2015-02-11 06:49:51 +00:00
qtbase.pro mkspec: Correctly cleanup qhost.pri file. 2016-03-22 09:45:10 +00:00
sync.profile make a proper header-only module for QtZlib 2015-11-17 20:22:17 +00:00