AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77da617dc8
qt5base-lts/mkspecs/common
History
Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
2015-08-06 10:54:01 +02:00
..
aix Update copyright headers 2015-02-11 06:49:51 +00:00
android Update copyright headers 2015-02-11 06:49:51 +00:00
c89 Update copyright headers 2015-02-11 06:49:51 +00:00
ios iOS: remove unrecognized compiler flag '-fno-arc-abi' 2015-06-29 15:18:29 +00:00
mac Update copyright headers 2015-02-11 06:49:51 +00:00
nacl Update copyright headers 2015-02-11 06:49:51 +00:00
posix Update copyright headers 2015-02-11 06:49:51 +00:00
qnx Update copyright headers 2015-02-11 06:49:51 +00:00
wince Makes sure that yacc works with the MSYS bison on Windows. 2015-07-20 16:09:07 +00:00
winrt_winphone winrt: Fix build when INADDR_XXX macros are not defined 2015-07-22 06:44:00 +00:00
armcc.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
clang-mac.conf Make CONFIG += c++11 by default not disable GNU extensions 2015-07-17 17:36:27 +00:00
clang.conf Make CONFIG += c++11 by default not disable GNU extensions 2015-07-17 17:36:27 +00:00
g++-base.conf Make CONFIG += c++11 by default not disable GNU extensions 2015-07-17 17:36:27 +00:00
g++-macx.conf Remove the -load_all option from the linker enabling static builds 2015-01-07 09:57:07 +01:00
g++-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
g++.conf Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
gcc-base-mac.conf Add __APPLE_CC_ to QMAKE_COMPILER_DEFINES for moc.prf 2015-03-04 22:13:41 +00:00
gcc-base-unix.conf rpath: use new DTAGS if available 2015-05-05 12:04:15 +00:00
gcc-base.conf Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00
ios.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-android.conf purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
linux.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00
llvm.conf Refer to Apple products by their actual names. 2013-07-10 17:32:48 +02:00
mac.conf Enable rpath support on OS X and iOS platform 2014-08-09 15:37:39 +02:00
macx.conf Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-12 14:03:21 +02:00
msvc-desktop.conf Merge remote-tracking branch 'origin/5.5' into dev 2015-08-06 10:54:01 +02:00
qcc-base-qnx-armle-v7.conf QNX: enable Neon support to be compiled in for QNX 2015-03-09 14:19:24 +00:00
qcc-base-qnx-x86.conf Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
qcc-base-qnx.conf make QMAKE_DIRLIST_SEP consistent with QMAKE_DIR_SEP 2014-04-30 16:57:01 +02:00
qcc-base.conf Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00
sanitize.conf Add support for gcc/clang's sanitize features 2014-10-02 19:45:00 +02:00
shell-unix.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00
shell-win32.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00
unix.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00