AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f6fc34294f
qt5base-lts/src/corelib/global
History
Edward Welbourne f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
2016-08-01 18:20:00 +02:00
..
archdetect.cpp Add "-softfloat" to archdetect.cpp and clarify what to use when 2016-06-19 18:46:36 +00:00
global.pri Restore the -fno-lto build of qversiontagging.cpp 2016-05-23 18:22:15 +00:00
qcompilerdetection.h Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qendian.h Remove duplicated QT_HAS_BUILTIN define 2016-06-21 18:58:27 +00:00
qendian.qdoc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qfeatures.txt Introduce QT_NO_MIMETYPE 2015-02-17 00:06:47 +00:00
qflags.h Let Q_DECLARE_METATYPE and Q_DECLARE_FLAGS be undefined under Q_MOC_RUN 2016-05-04 16:43:30 +00:00
qglobal_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00
qglobal.cpp qFatal: unify the code path for aborting via std::abort 2016-07-25 22:18:49 +00:00
qglobal.h Extend PLATFORM_SDK_EQUAL_OR_ABOVE and DEPLOYMENT_TARGET_BELOW macros 2016-07-19 20:54:07 +00:00
qglobalstatic.cpp Updated license headers 2016-01-21 18:55:18 +00:00
qglobalstatic.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qhooks_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00
qhooks.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
qisenum.h Updated license headers 2016-01-15 12:25:24 +00:00
qlibraryinfo.cpp CoreLib: use QStringRef to optimize memory allocation 2016-07-02 07:39:06 +00:00
qlibraryinfo.h Deprecate QLibraryInfo::licensee()/licensedProducts() 2016-05-23 11:19:45 +00:00
qlogging.cpp qFatal: unify the code path for aborting via std::abort 2016-07-25 22:18:49 +00:00
qlogging.h Updated license headers 2016-01-15 12:25:24 +00:00
qmalloc.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qnamespace.h Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
qnamespace.qdoc Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
qnumeric_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00
qnumeric.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qnumeric.h Updated license headers 2016-01-15 12:25:24 +00:00
qprocessordetection.h Remove Windows CE vestiges 2016-06-02 08:03:37 +00:00
qsysinfo.h Update for the newest Darwin-family operating systems. 2016-06-23 02:37:12 +00:00
qsystemdetection.h Update for the newest Darwin-family operating systems. 2016-06-23 02:37:12 +00:00
qt_pch.h Updated license headers 2016-01-15 12:25:24 +00:00
qt_windows.h Remove Windows CE vestiges 2016-06-02 08:03:37 +00:00
qtypeinfo.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
qtypetraits.h Updated license headers 2016-01-15 12:25:24 +00:00
qversiontagging.cpp Updated license headers 2016-01-21 18:55:18 +00:00
qversiontagging.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00