AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28a57799ce
qt5base-lts/mkspecs/devices
History
Frederik Gladhorn c5a3e5edd9 Merge remote-tracking branch 'origin/5.3' into 5.4 
The isAlwaysAskOption was removed in 3862171315
so manually removed code in
src/plugins/bearer/connman/qconnmanengine.cpp

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/tools/qcollator_macx.cpp
	src/corelib/tools/qstring.cpp
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow_p.h
	src/gui/text/qtextengine.cpp
	src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
	src/plugins/platforms/android/qandroidinputcontext.cpp
	src/plugins/platforms/xcb/qglxintegration.cpp
	src/plugins/platforms/xcb/qglxintegration.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	src/testlib/qtestlog.cpp
	src/widgets/dialogs/qfiledialog.cpp
	src/widgets/kernel/qwindowcontainer.cpp
	tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
	tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
	tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp

Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
2014-09-23 11:23:36 +02:00
..
blackberry-playbook-armle-v7-qcc Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
blackberry-playbook-armv7le-qcc Rename BlackBerry arm mkspecs to be aligned with NDK structure 2013-10-23 19:09:54 +02:00
blackberry-playbook-x86-qcc Qnx: Add BlackBerry Playbook config token 2013-03-06 21:50:28 +01:00
common Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-archos-gen8-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-arm-amlogic-8726M-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-arm-hisilicon-hix5hd2-g++ add support for device linux-arm-hisilicon-hix5hd2-g++ 2014-07-02 13:34:07 +02:00
linux-arm-trident-pnx8473-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-beagleboard-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-imx6-g++ Set iMX device specific compiler flags to QMAKE_CFLAGS 2014-08-14 12:26:36 +02:00
linux-imx53qsb-g++ Set iMX device specific compiler flags to QMAKE_CFLAGS 2014-08-14 12:26:36 +02:00
linux-mipsel-broadcom-97425-g++ [bcm97425] Fix parameter issue in platformDestroy hook 2014-07-01 16:58:31 +02:00
linux-rasp-pi-g++ eglfs: Remove unused variable on raspi 2014-01-24 11:33:00 +01:00
linux-sh4-stmicro-ST7108-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-sh4-stmicro-ST7540-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-snowball-g++ Remove automated generation of dwarf index 2014-02-16 15:41:30 +01:00
linux-tegra2-g++ Remove runtime detection of Neon on ARM CPUs 2014-01-16 02:59:49 +01:00