Go to file
Bjoern Breitmeyer 32d4be8598 Integrate device-option into the windows configure
Windows configure does not have -device-option yet.
A hack for android already generated the
qdevice.pri. But it did this even if no android
was build, so merged the device-option with the
android generation of qdevice.pri. The qdevice.pri
is generated earlier in the configure steps than
before to match the linux configure and allow
to set device options before the config.tests
are run.

Change-Id: I753cf0d5eba1479792a685d6e1f5acb38b970893
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-15 18:02:42 +02:00
bin Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable 2013-06-15 22:39:25 +02:00
config.tests Replace the Intel Haswell and Ivy Bridge codenames with actual names 2013-08-08 02:46:45 +02:00
dist update QtNetwork changelog for 5.1.0 2013-06-19 19:10:23 +02:00
doc Doc: Re-highlight Tweet Search demo 2013-07-29 15:08:58 +02:00
examples Changed digia contact details to */legal, updated licenses 2013-07-20 11:21:46 +02:00
lib
mkspecs suppress error output from pkg-config 2013-08-15 18:02:42 +02:00
qmake Doc: public test functions in function libraries 2013-08-15 15:54:12 +02:00
src add configure -extprefix option 2013-08-15 18:02:42 +02:00
tests QHeaderView::paintSection(): fix visible index handling 2013-08-15 11:37:27 +02:00
tools Integrate device-option into the windows configure 2013-08-15 18:02:42 +02:00
util Use BSD licensing for QtOpenGLExtensions instead of LGPL 2013-06-24 10:16:32 +02:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Long live QLockFile 2013-03-05 06:26:33 +01:00
.qmake.conf bye-bye .qmake.cache 2013-08-12 19:01:45 +02:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure add configure -extprefix option 2013-08-15 18:02:42 +02:00
configure.bat get rid of syncqt wrapper scripts 2013-05-13 21:54:48 +02:00
header.BSD Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.FDL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL-ONLY Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
INSTALL INSTALL: Fix URL of Installing Qt documentation 2013-04-11 16:09:07 +02:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL
LICENSE.GPL
LICENSE.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
LICENSE.PREVIEW.COMMERCIAL Update LICENSE.PREVIEW.COMMERCIAL license 2013-06-03 20:04:26 +02:00
qtbase.pro Merge remote-tracking branch 'origin/release' into stable 2013-06-20 16:13:38 +02:00
sync.profile put ANGLE includes in a QtANGLE subdir 2013-06-10 21:12:13 +02:00