AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a1fe728fa5
qt5base-lts/mkspecs/common
History
Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev 
Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformintegration.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/sql/doc/src/sql-driver.qdoc
	src/widgets/widgets/qtoolbararealayout.cpp

Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
2014-02-07 13:07:25 +01:00
..
aix Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
android Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
c89 Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
ios Merge remote-tracking branch 'origin/stable' into dev 2013-05-23 21:27:07 +02:00
mac expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
nacl Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
posix Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
wince expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
winrt_winphone WinRT: Provide qmake feature for generating a package manifest 2014-01-24 08:19:00 +01:00
armcc.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
clang-mac.conf Enable C++11 on OSX when using Clang 2013-04-05 14:23:23 +02:00
clang.conf Add support for using -isystem in qmake 2014-01-20 02:42:31 +01:00
g++-base.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
g++-macx.conf Refer to Apple products by their actual names. 2013-07-10 17:32:48 +02: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 Do not limit clang generated debug info to dwarf-2 on mac. 2014-01-21 15:18:24 +01:00
gcc-base-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
gcc-base.conf Add support for using -isystem in qmake 2014-01-20 02:42:31 +01:00
ios.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-android.conf Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
linux.conf Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
llvm.conf Refer to Apple products by their actual names. 2013-07-10 17:32:48 +02:00
mac.conf Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-12 14:03:21 +02:00
macx.conf Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-12 14:03:21 +02:00
qcc-base-qnx-armv7le.conf Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
qcc-base-qnx-x86.conf Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
qcc-base-qnx.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
qcc-base.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
shell-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
shell-win32.conf make sure that installed meta files are always postprocessed 2013-10-11 21:04:04 +02:00
unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00