summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-171-1/+2
|\ | | | | | | | | | | | | | | Conflicts: mkspecs/macx-ios-clang/features/resolve_config.prf src/testlib/qtestcase.qdoc Change-Id: Icefa63056ffb37106f35299a8f19165535571799
| * Match MSVC version strings in other languages than EnglishMichael Brüning2016-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | 5971b88ecd08a81720c3556029cecd35b0cf2cb5 introduced a regular expression to parse the Visual C++ compiler version that failed to match non-English output (e.g. German), which is produced by default on many systems. Task-number: QTBUG-56388 Change-Id: Id0408ce31e827e7aa087d8e3dd83024cf09dac23 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * configure.exe: Detect MSVC version with environment variable CL clearedFriedemann Kleint2016-10-141-0/+1
| | | | | | | | | | | | | | | | | | The variable may contain the option /nologo, suppressing the output. Change-Id: I63eedde10aa7264cf56807a0844cadf6293a1d8c Task-number: QTBUG-56388 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-163-0/+35
|\| | | | | | | | | | | | | Conflicts: src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074
| * configure.exe: Write MSVC compiler version to qconfig.priFriedemann Kleint2016-09-033-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Backport a feature of the new configure system setting the variables QT_CL_MAJOR_VERSION, QT_CL_MINOR_VERSION, QT_CL_PATCH_VERSION similarly to the existing variables for gcc. This allows for disabling optimizations depending on the compiler version. Task-number: QTBUG-55238 Change-Id: If2349b008c1049e2ab98a5c1160b244a6e8937a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | move c++11 test into qcompilerdetection.h and make it stricterOswald Buddenhagen2016-07-221-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | it positively makes no sense to have a configure test which will be never reached due to the configure/qmake bootstrap failing with a slew of totally unhelpful error messages. pre-standardization partial c++11 implementations are now rejected, except for VS2013, which is still sufficient despite not announcing full compatibility. Change-Id: I58af10e03960af06b80cedac105cf8433f7a1745 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | configure.exe: Show error on "-target xp" optionOliver Wolff2016-07-121-3/+6
| | | | | | | | | | | | | | | | | | | | The option was removed in dev but should have been removed in 5.7. In order not to complicate merges most of the code that was removed in dev has been kept as is and only the "bare minimum" was removed. Task-number: QTBUG-54674 Change-Id: I5118fe344de014bdcf008cccfe9eca112896d23a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-041-1/+1
|\| | | | | | | Change-Id: Ibd81cd1df4a0650d93fcb556a57be90be2e1f569
| * Fix URL to ANGLEFriedemann Kleint2016-06-301-1/+1
| | | | | | | | | | | | | | | | | | Point to the README.md of the project; the old URL http://code.google.com/p/angleproject is now redirected to the bugtracker. Change-Id: I293fc150d5b6c08f16effe8921010050faa264b5 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-5/+0
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsimd_p.h Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
| * | Determine the compiler's default include and lib directories at qmake timeKai Koehne2016-05-241-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a long-standing issue for Qt packages, where the paths detected at configure time do not necessarily match the paths on the user's machine. Hence they have been stripped manually from qconfig.pri so far, preventing moc from resolving some includes. The same logic in configure is left alone for the time being, since the paths there are also used to filter paths returned by pg_config and mysql_config. I expect that this will eventually be removed too in a bigger refactoring going on right now in dev. Asking the compiler for implicit paths only works for non-msvc builds - that is, gcc, clang and icc fortunately have a compatible way to retrieve the paths. MSVC works solely on environment variables, which will be taken into account by a separate patch. [ChangeLog][qmake] The implicit compiler directories that moc needs for resolving include files are now determined when qmake runs. So far QMAKE_DEFAULT_INCDIR was determined at configure time, which might be wrong for relocated installations. Task-number: QTBUG-52687 Change-Id: If0706e8c56a5aca2b6e777e79e90342c498726f3 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | configure: check whether std::atomic<T> works for function pointersThiago Macieira2016-06-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | And ask the user to apply one of the patches we're carrying to their Standard Libraries. Change-Id: I7e6338336dd6468ead24ffff141139c79056922e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-061-3/+3
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf config.tests/unix/nis/nis.cpp mkspecs/unsupported/freebsd-g++/qplatformdefs.h src/corelib/tools/qdatetime.cpp src/corelib/tools/qsimd.cpp src/corelib/tools/qsimd_p.h src/network/access/access.pri src/network/access/qnetworkreplynsurlconnectionimpl.mm src/network/access/qnetworkreplynsurlconnectionimpl_p.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/printsupport/windows/qwindowsprintdevice.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp tests/auto/network/access/qnetworkreply/BLACKLIST tests/auto/widgets/widgets/qopenglwidget/BLACKLIST Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
| * delay application of -D/-I/-L/-l on windows as wellOswald Buddenhagen2016-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | clearly, "the windows configure does not have any of this magic to start with" was flat-out wrong. Task-number: QTBUG-53312 Change-Id: I80ac10bc8b1581e61c57fcd97f25626990d120ec Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-3/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp src/network/access/qnetworkaccessmanager.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h src/widgets/widgets/qlineedit_p.cpp src/widgets/widgets/qlineedit_p.h src/winmain/winmain.pro tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp tools/configure/configureapp.cpp Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
| * Adjust FreeType choice made by configureappJames McDonnell2016-05-121-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | FontConfig requires FreeType, so choosing the system FontConfig (there isn't a bundled FontConfig) means that the system FreeType must be used. QNX ended up configured to include the bundled FreeType and the system FontConfig which produced a fault when bundled FreeType structures got passed through FontConfig to the system FreeType. Task-number: QTBUG-52578 Task-number: QTBUG-51417 Change-Id: I56add73d34320c1d08f63b57cb0fef1ba06264e8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | QNX: Force use of system zlib on Windows hostLiang Qi2016-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we on Linux will do a compile test to check for a system zlib, the test on a Windows host was less accurate, causing us to compile in the zlib from 3rdparty/ here. This caused compilation errors after updating the freetype font engine to support color fonts, since the zlib in 3rdparty/ was included implicitly in the freetype library, and since it depends on Qt headers, the compilation failed in this context. The hotfix is to force system zlib on QNX for Windows hosts, since we know it is available in the NDK. Doing a proper build check is not worth it right now, due to future plans for changing configure. We will still break for an explicit -qt-zlib compilation, so the plan is to fix this in an upcoming commit by separating libpng into a library. The hotfix just follows e6cb3b8c. Task-number: QTBUG-53248 Change-Id: I07dd4356fae6397b3cc93fc1fa97bf35380e19df Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-05-061-0/+2
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-061-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qtestlib/tutorial5/containers.cpp examples/widgets/tools/tools.pro src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/network/kernel/qdnslookup_unix.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp tools/configure/configureapp.cpp Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
| | * Change some QNX defaultsJames McDonnell2016-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make REDUCE_EXPORTS the default for QNX. This is what the Linux builds use. The Windows builds should too. Turn on ICU detection for QNX. QNX has ICU. Task-number: QTBUG-52578 Change-Id: Ie65c6ff03c4eecf361727b3b6026338f686d9749 Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Android: Force use of system zlib on Windows hostEskil Abrahamsen Blomfeldt2016-05-061-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we on Linux will do a compile test to check for a system zlib, the test on a Windows host was less accurate, causing us to compile in the zlib from 3rdparty/ here. This caused compilation errors after updating the freetype font engine to support color fonts, since the zlib in 3rdparty/ was included implicitly in the freetype library, and since it depends on Qt headers, the compilation failed in this context. The hotfix is to force system zlib on Android for Windows hosts, since we know it is available in the NDK. Doing a proper build check is not worth it right now, due to future plans for changing configure. We will still break for an explicit -qt-zlib compilation, so the plan is to fix this in an upcoming commit by separating libpng into a library. Change-Id: I7854c3c762fa37f7ee4b5f1112dbae8b5973ea86 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Disable Directwrite 2 when Directwrite is disabledEskil Abrahamsen Blomfeldt2016-04-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | While this wouldn't have any consequences in practice, it was perceived as confusing to users that Directwrite 2 was listed as enabled in the summary when Qt was configured with -no-directwrite. To give a better presentation of what will actually be compiled, we force disable Directwrite 2 when Directwrite is disabled. Task-number: QTBUG-52952 Change-Id: I779772ecc4d47b20854588cedde2b097ae22ded4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-04-261-0/+15
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-251-0/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/compile.test configure src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java src/corelib/global/qglobal.cpp src/widgets/kernel/qapplication.cpp src/widgets/styles/qwindowsvistastyle.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp Change-Id: I067083f34e5290aa5f7565e40c30a069cc37b83a
| | * Add the ability to change precompiled header useJames McDonnell2016-04-191-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give the Windows configureapp the same -pch/-no-pch arguments found in the Linux configure script. Using command line arguments to enable/disable precompiled header use is preferable to mkspec changes. Make -pch the default for all toolchains. In particular, this makes -pch the default for QNX on Windows. Previously, QNX on Windows had an implied default of -no-pch. Precompiled headers are the default for QNX on Linux; they should also be the default for QNX on Windows. A 'dictionary["PCH"] = "no"' will need to be added in Configure::applySpecSpecifics for any toolchain that should default to -no-pch (none known at this time). -no-pch is implemented by putting a "CONFIG -= precompile_header" in qmodule.pri. This ensures that Qt is built without precompiled headers (as requested) even if allowing precompiled header use is the default for the toolchain. Task-number: QTBUG-52578 Task-number: QTBUG-11545 Change-Id: I1b59bc2d416c5ba169161c5b3cc13accd76eeac8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | ConfigureApp: fix warning -Wsign-compare.Anton Kudryavtsev2016-04-251-1/+1
|/ / | | | | | | | | | | | | Use size_t as index type for C array. Change-Id: I0980f47ef881108c9639a2a73fbb878b7d8161d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Add color font support on WindowsEskil Abrahamsen Blomfeldt2016-04-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if DirectWrite 2 is available, and support color fonts if possible. One limitation worth mentioning is that if the color font contains regular, monochrome glyphs as well, then these will be drawn in black, and not in the pen color. Fixing this would require some elaborate rewrites in the font rendering system, since we would have to have two font caches per color font (one for mono and one for colors), or do some sort of trick where we make argb(r, g, b, 0) mean subpixel alpha instead, and detect glyphs that are not correctly premultiplied when blitting to the screen. Another limitation is that the approach does not work with distance field rendering. In principle we could support this on Windows, since the format is vector based, but it would also require substantial work and it is not possible to support for Apple/Google fonts anyway, so it would just lead to code which is not cross-platform. [ChangeLog][Windows] Added support for color fonts (color emojis) when DirectWrite 2 is available. Change-Id: I6a608dd5d2aa3a7e762a06830902bddac7c550a5 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | tools/configure: enable QStringBuilderAnton Kudryavtsev2016-04-083-3/+8
| | | | | | | | | | | | | | ... by adding define QT_USE_QSTRINGBUILDER. Change-Id: I89bfdff3f4fc2585649b586ebb5414831cb76765 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-03-231-1/+6
|\| | | | | | | Change-Id: I9a10e1f3c9506ec8554d8f59b6300825ac730939
| * qmake: Fix wince dll deployment in Visual StudioAndreas Holzammer2016-03-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix repairs the mechanism to deploy Qt dlls as well as C++ runtime to a wince target in Visual Studio. Do this by adding a deploy section in the Visual Studio solution and adding the C++ runtime from the mkspec to the files deployed to the target. Deploy target path is set to what the wizard of Visual Studio defaults to. Before, the c++ runtime was only deployed for executables which were built as part of Qt. Task-number: QTBUG-50924 Change-Id: I478010dc16e35c68578281895aa3ae14b5c96bb4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * fix bad initializer for -optimized-toolsOswald Buddenhagen2016-03-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-51967 Change-Id: I5b4a3f0ff6358149bc338c6ac2e0b57638bdff7f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * wince: Adjust configure defaultsAndreas Holzammer2016-03-211-9/+0
| | | | | | | | | | | | | | | | | | Remove outdated configure defaults to support features that get autodetected. Change-Id: Ia802ccd3fe9defa97e2667e81dff6e815a7b45b3 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-111-1/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change partially reverts 1bfc7f68 about QT_HAS_BUILTIN define and undef in src/corelib/tools/qsimd_p.h. This change is also squashed with "Fall back to c++11 standard compiler flag for host builds" which is done by Peter Seiderer. Conflicts: mkspecs/features/default_post.prf src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch src/3rdparty/sqlite/sqlite3.c src/corelib/tools/qsimd_p.h src/gui/kernel/qevent.cpp src/gui/kernel/qwindowsysteminterface.cpp src/gui/kernel/qwindowsysteminterface_p.h src/plugins/bearer/blackberry/blackberry.pro src/plugins/platforms/cocoa/qcocoasystemsettings.mm src/plugins/platformthemes/gtk2/gtk2.pro src/plugins/styles/bb10style/bb10style.pro src/sql/drivers/sqlite2/qsql_sqlite2.cpp tools/configure/configureapp.cpp Task-number: QTBUG-51644 Done-with: Peter Seiderer <ps.report@gmx.net> Change-Id: I6100d6ace31b2e8d41a95f0b5d5ebf8f1fd88b44
| * Allow overriding Android NDK host on WindowsEskil Abrahamsen Blomfeldt2016-03-101-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The -android-ndk-host argument to configure existed in the shell script, but not in the Windows version. When using a 64-bit NDK but a 32-bit host compiler (which is what we bundle with our SDK), we would not detect the correct NDK host, making it impossible to build Qt with this combo. [ChangeLog][Android] Added -android-ndk-host configure option on Windows. Change-Id: Ie6a92b66e6875ed53f46fe41ecced70c3ec67585 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * configure: Fix (Open)SSL detection on WinCEAndreas Holzammer2016-03-071-2/+2
| | | | | | | | | | | | | | | | | | "ssl" should be defined when "openssl" is defined, and WinCE should default to autodetection of OpenSSL. (cherry picked from commit f2fbee5134c2c0b33bdddf0a6419f3c770e1f89c) Change-Id: I9110b245d66fac233eb2bfe89b26cb34cee3e291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | configure: Remove Windows CE.Friedemann Kleint2016-03-081-172/+5
| | | | | | | | | | | | | | | | The platform has been removed in Qt 5.7. Task-number: QTBUG-51673 Change-Id: Id0b26e94bd8a673a35bfa5e02a5ba1c30891764a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove LGPLv2 as a license option in configureLars Knoll2016-02-151-11/+11
| | | | | | | | | | | | | | | | | | Instead show LGPLv3 and GPLv2 as valid options for the open source edition. Change-Id: Id7a203226428031ec873cbaf106dca14a854f155 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Add initial clang-cl support to QtAndreas Holzammer2016-02-111-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the functionality to build Qt with clang under Windows against the Microsoft Visual Studio 2015 runtime. In order to replicate this, a Clang 3.8 build with Visual Studio 2015 Update 1 is needed. Adds compiler detection to Qt to distinguish correctly the clang compiler and Windows with Visual Studio. Clang has some built-in numeric functions, there is no need to use the Microsoft versions, which also conflict here. Task-number: QTBUG-50804 Change-Id: Ia4b267a298310ac7d73edf473b12792991249d8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-021-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/compile.test src/plugins/platforms/cocoa/qcocoahelpers.mm src/tools/qlalr/cppgenerator.cpp Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3
| * Don't use QStringLiteral in comparisonsAnton Kudryavtsev2016-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Add Intel copyright to files that Intel has had non-trivial contributionThiago Macieira2016-01-211-0/+1
| | | | | | | | | | | | | | | | | | I wrote a script to help find the files, but I reviewed the contributions manually to be sure I wasn't claiming copyright for search & replace, adding Q_DECL_NOTHROW or adding "We mean it" headers. Change-Id: I7a9e11d7b64a4cc78e24ffff142b506368fc8842 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Update the Intel copyright yearThiago Macieira2016-01-211-1/+1
| | | | | | | | | | | | | | | | | | Not that we require it, but since The Qt Company did it for all files they have copyright, even if they haven't touched the file in years (especially not in 2016), I'm doing the same. Change-Id: I7a9e11d7b64a4cc78e24ffff142b4c9d53039846 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-2110-170/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I42a473ddc97101492a60b9287d90979d9eb35ae1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-184-13/+19
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
| * configureapp: Print FontConfig in "Third Party Libraries" sectionKonstantin Ritt2015-12-101-3/+3
| | | | | | | | | | | | | | ...just like in config.summary Change-Id: Idb34cdd39f706d7a7e75dfc0388d0a1fdb1f2317 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * configureapp: Add missing empty line between paragraphsKonstantin Ritt2015-12-101-1/+1
| | | | | | | | | | Change-Id: I0f6424471d64976a6c93876e18da3c77000d6390 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Fix swapped descriptions for [-no]-optimized-toolsKonstantin Ritt2015-12-101-2/+2
| | | | | | | | | | Change-Id: I5953b83ec2b4adee953caea0cb1e39d54b78bebb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Remove Wow6432Node versions of Visual Studio registry keysJoerg Bornemann2015-12-083-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | The Visual Studio registry keys are stored in the 32 bit view. Extend qt_readRegistryKey with an option that enables the caller to choose the 32 bit or 64 bit registry view. We now read the Visual Studio registry keys from the 32 bit registry view even in a 64 bit build. Adding the next Visual Studio version will become a bit easier. Change-Id: I7300b992be6058f30a422e3f1fe0bafade6eea54 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | qt_safe_poll: fix Windows to QNX/Android cross compilesLouai Al-Khanji2015-12-111-0/+5
| | | | | | | | | | | | Task-number: QTBUG-49875 Change-Id: I8820f28351dff385d12a4c469ed689914f87b924 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-021-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreapplication.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/network/bearer/qnetworkconfiguration.cpp src/plugins/bearer/blackberry/qbbengine.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformtheme.cpp src/plugins/platforms/qnx/qqnxbpseventfilter.cpp src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxnavigatorbps.cpp src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp src/plugins/platforms/qnx/qqnxwindow.cpp src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qwindowsvistastyle.cpp src/widgets/styles/qwindowsxpstyle.cpp src/widgets/widgets/qtoolbararealayout.cpp tests/auto/corelib/global/qflags/qflags.pro tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 05:39:34 +0000