summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usagev5.7.0Antti Kokko2016-06-1053-158/+688
| | | | | | | Updated BSD license. Change-Id: Ie2521f94a2e8ed423f989e902e5eb88512814f71 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Unify license header usageAntti Kokko2016-06-1046-230/+230
| | | | | | | Updated FDL license. Change-Id: I726ee109b17070d79e19c9edcdba7780aa54b1f1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Updated license headers and license testsAntti Kokko2016-06-10749-12738/+8993
| | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed 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) License header tests also updated to match current headers. Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Updated license headersAntti Kokko2016-06-10171-2224/+3828
| | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I25237f97989d42da1130ed5c0839c31eb3904d34 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-06-012-4/+9
|\ | | | | | | Change-Id: Ica1f85f846ab890c76d2e5e2afb186856a208e24
| * Qt Designer/DnD: Take device pixel ratio of grabbed pixmaps into account.v5.6.1-1v5.6.1Friedemann Kleint2016-05-312-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change qtbase:ccfe33dc670a1491d9e1daa2ae17f5fe30484276 modifies QWidget::grab() to return pixmaps with device pixel ratio set when High DPI scaling is active. This caused Dnd pixmaps to have the wrong size and the widgets to change size when moved on the form due to the decoration having the wrong size. Propagate the device pixel ratio and scale sizes accordingly. Task-number: QTBUG-53713 Change-Id: I93fc5c249472913ddc4866b32d7bf2593df60635 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6.1' into 5.7.0v5.7.0-rc1Liang Qi2016-05-271-4/+4
|\| | | | | | | Change-Id: I776e0503279ee3ca7726459c97056a92dcfbdaa4
| * lupdate: Fix parsing of class template specializationsKai Pastor2016-05-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ea581c95ae9704b250591c5d4d9b0517f5b62f2 introduced a bug where class template specialization would lead to contexts not being properly cleaned up on '}'. The occurrence of class template specializations lead to a massive slowdown in parsing following includes because they were treated as direct (in-namespace) and parsed more often than normally needed. Unfortunately the bug was not discovered early by the auto tests, but eventually the slowdown appeared in CI when merging to dev. This change adds a test for class template specializations. It would discover the cause (broken context) which triggers the slowdown but doesn't depend on includes. Task-number: QTBUG-53644 Change-Id: I94cce58702b53dfb5e0f9c92585222dd3f938593 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-05-261-10/+20
|\| | | | | | | Change-Id: I92f700c15556b5c8f5f6cd66c490190ea7c9a46c
| * Fix macdeployqt with certain library paths.Jake Petroules2016-05-261-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | macdeployqt assumed that relative library paths referred to a Qt library or framework that was not contained in any specific directory. This was broken in the case of paths like somedir/libfoo.dylib. macdeployqt now takes the additional path components into account. There was also a trailing space after ".dylib " which snuck in after refactoring to centralize otool output parsing which caused failures in Qt Creator deployment. Task-number: QTBUG-53533 Task-number: QTBUG-53563 Change-Id: I4296b7dd805d4866d3bf0db486366c30dece7add Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1930-77/+179
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5fde87a1ac22e933c926e0d86996791a38d92c4e
| * | Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-196-6/+6
| |\| | | | | | | | | | Change-Id: Ie9b5988af8eb502de001a1ace83996a8e9659a18
| | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-126-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Icdb94fbde0c719722248c54e8d0e75b2877ab1d1 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * | New application icons for designer, linguist and assistantAlessandro Portale2016-05-1216-0/+0
| |/ | | | | | | | | Change-Id: I5cfd9c8d616e6608b901e7aa288cf9b90fd3a044 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
| * Remove extraneous . at the end of the optionThiago Macieira2016-05-101-1/+1
| | | | | | | | | | Change-Id: Id69569111e7d4e619e22ffff144d170804b03699 Reviewed-by: Volker Krause <volker.krause@kdab.com>
| * Don't use qDebug for formatted output - but QDebug is okThiago Macieira2016-05-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's the difference between readable output and unreadable mess. Good: QPlatformSurfaceEvent(surfaceEventType=SurfaceCreated) QEvent(WinIdChange, 0x7ffdadee2bd0) QEvent(WindowIconChange, 0x7ffdadee2d30) Bad: [351295.324] qev(88029 88029)(Widget::event|QApplicationPrivate::notify_helper|QApplication::notify|QCoreApplication::notifyInternal2|QCoreApplication::sendEvent|?libQt5Widgets.t.so.5?|QApplicationPrivate::notify_helper|QApplication::notify|QCoreApplication::notifyInternal2|QCoreApplication::sendEvent): QPlatformSurfaceEvent(surfaceEventType=SurfaceCreated) [351295.333] qev(88029 88029)(Widget::event|QApplicationPrivate::notify_helper|QApplication::notify|QCoreApplication::notifyInternal2|QCoreApplication::sendEvent|QWidgetPrivate::setWinId|QWidgetPrivate::create_sys|QWidget::create|QWidget::setVisible|QWidget::show): QEvent(WinIdChange, 0x7ffca6714280) [351295.333] qev(88029 88029)(Widget::event|QApplicationPrivate::notify_helper|QApplication::notify|QCoreApplication::notifyInternal2|QCoreApplication::sendEvent|?libQt5Widgets.t.so.5?|QApplicationPrivate::notify_helper|QApplication::notify|QCoreApplication::notifyInternal2|QCoreApplication::sendEvent): QEvent(WindowIconChange, 0x7ffca67143e0) Change-Id: Id69569111e7d4e619e22ffff144d16fb04876219 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Fix macdeployqt usage when client application has no rpath to Qt libs.Jake Petroules2016-05-102-49/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | macdeployqt used to determine the Qt library path from one of the Qt libraries linked to by the application (by searching its rpath list). However, if an application does not have an rpath pointing to the Qt library directory, macdeployqt cannot find the Qt libraries. This is likely when the application is built with a non-qmake build system like CMake or qbs. This patch adds the Qt library path (from QLibraryInfo) as a fallback search path to allow macdeployqt to find the Qt libraries and deploy them. Task-number: QTBUG-47868 Change-Id: Ie1d005955826b416c223a1bc6cac911d2ae44b20 Reviewed-by: Guilherme Steinmann <guidefloripa@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
| * Qt Designer: Base ObjectInspectorDelegate on QStyledItemDelegate.Friedemann Kleint2016-05-021-4/+5
| | | | | | | | | | | | | | | | | | | | | | The class previously was inheriting QItemDelegate which caused it to paint in Windows XP style. This style has a very low contrast when the widget does not have focus, which makes it hard to spot the selected widget when working on the form. Task-number: QTBUG-53020 Change-Id: I69e9e950ca1cc8b4d6ccbf55fd48a54d50eac7e1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| * Qt Designer: Fix a crash when deleting an automatically promoted class.Friedemann Kleint2016-05-021-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Classes that are no longer present (missing plugins) are automatically promoted by Qt Designer. Deleting such a class currently causes a crash when further promoted classes using them as a base class exist. Extend QDesignerPromotion::removePromotedClass() to change the base class of such classes to the base class of the automatically promoted class. Task-number: QTBUG-52963 Change-Id: I39591dc198ee3a4a4a0a5d86bbc8e08bbfb03059 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| * qtdiag: Output the application's palette.Friedemann Kleint2016-04-291-0/+14
| | | | | | | | | | | | | | | | Output active colors of the palette. Change-Id: I055222468fe2e0fc0c447c4acbdb6ae7ac7d0bff Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * lupdate: Explicitly handle C++ member initializer listsKai Pastor2016-04-281-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the cpp parser explicitly deal with parens and braces in member initializer lists of constructors. It fixes problems with C++11 syntax like list-initialization and lambdas. It adds auto tests for tr() calls in initialization expressions. The combination of parens in base class template parameters with list initialization (braces) remains unsupported. Task-number: QTBUG-34128 Task-number: QTBUG-42166 Change-Id: Id4ac0a011fcda8d2b72a15348a1b96fdd492ab32 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Do not unnecessarily set the window icons on WindowsAlessandro Portale2016-05-134-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications which have an .ico file in their (MS) resources will have their icon displayed just fine in the window title, task bar, task switcher, etc. These .ico files contain all resolutions which are needed by Windows. There is no need to re-set that icon from a ".png" file at runtime, which usually also implies scaling it. Change-Id: Iee6e141637bd5b8ccb677adae115eb84dd2dafa4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | qdoc: Allow example files to be excludedTopi Reinio2016-05-123-65/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation configuration variables 'excludedirs' and 'excludefiles' had no effect on what source and image files were listed as belonging to an example. This commit fixes that, and refactors excludedirs/files handling: Remove duplicated code blocks, amd simplify the code reading the variables: - Drop checks whether an excluded directory exists - Drop conversion of native separators for excluded paths Both are unnecessary; QDoc expects '/'-separated paths for many other variables, and if an excluded dir does not exist, it won't exclude anything. Change-Id: Ie25511e20d33888653c23bb84975368317eb4306 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | windeployqt: Adapt to new layout of Qt Quick Controls 2.Friedemann Kleint2016-05-061-6/+6
| | | | | | | | | | Change-Id: Ibd7a42bacbe07c726ecbfee6070832beeb23f335 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | windeployqt: Adjust to changes in QtWebEngineJoerg Bornemann2016-05-061-6/+11
| | | | | | | | | | | | | | | | | | There's now a debug version of QtWebEngineProcess which needs to be deployed with debug builds of QtWebEngine-based applications. Task-number: QTBUG-49493 Change-Id: Ie93f19c11ba5d49f8a23b615709021375b328080 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-04-2543-162/+167
|\| | | | | | | Change-Id: I6b72d14a0e6b6523a15e286422bdb15499f7f111
| * Qt Assistant: Set Qt::AA_EnableHighDpiScaling for Windows only.Friedemann Kleint2016-04-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | Scaling does not work overly well on Linux. Amends change a6a665bdb147d0a0fbfcd65053718a54e1d9815b. Task-number: QTBUG-50698 Task-number: QTBUG-52318 Change-Id: I0fd0f6c2dbec0d5fabc9d7e4cec82515f8357b03 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| * lupdate: Treat NULL and Q_NULLPTR like literal 0Kai Pastor2016-04-121-0/+8
| | | | | | | | | | | | | | Task-number: QTBUG-34265 Change-Id: I2b69d7c6bc0514977cee9dd50a0c861e46dc589b Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * qttools: Fix building clucene with Intel compiler.Karsten Heimrich2016-04-111-1/+1
| | | | | | | | | | | | Task-number: QTBUG-51688 Change-Id: I86dab9dfb3b8502c9c77fc88e3774c27413bebd9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Qt Property Browser: Fix usage of the deprecated QStyleOptionViewItemV2.Friedemann Kleint2016-04-081-1/+1
| | | | | | | | | | Change-Id: I800585587789b6917f0ebd7139ef279349d7be42 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| * Qt Designer: Fix Clang warnings about missing/inconsistent overrides.Friedemann Kleint2016-04-0839-160/+155
| | | | | | | | | | | | | | | | Add missing overrides and remove FormWindowBase::emitSelectionChanged() as it was hiding QDesignerFormWindowInterface::emitSelectionChanged(). Change-Id: I4d07e6d0012aed931b9cad88878f29d026f3b1e3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-084-4/+6
|\| | | | | | | Change-Id: I49a57527be78cb30692467b2e227aa8afc49dd7d
| * QDoc: Add a space between "Note:" and "Signal"hjk2016-04-081-1/+1
| | | | | | | | | | | | | | ... in the "Note:Signal ... is overloaded in this class." hint. Change-Id: I4020a43613f655170cf88b03d1c689f3eb3584e3 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| * lupdate: Add two missing tr()Kai Pastor2016-04-071-2/+2
| | | | | | | | | | Change-Id: Ie227da5bf2e79d72da188bb0f6ee47216fa76067 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * QDesignerDialogGuiInterface: Remove endless recursion.Friedemann Kleint2016-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix Clang warning: sdk\abstractdialoggui.cpp(142,1) : warning: all paths through this function will call itself [-Winfinite-recursion] The code did not have any effect since the function was overridden in a derived class. Change-Id: Iee86cc50b61b1329fe1997d2f412bfb9395ceed7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| * Qt Designer: Simplify selection when moving selections by arrow keys.Friedemann Kleint2016-04-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | Call FormWindow::simplifySelection() when moving with arrow keys as is done when moving using DND to prevent the geometry being applied to children. Task-number: QTBUG-52237 Change-Id: I94849636df6d94bc288982a601e44f54ec6c5cb9 Reviewed-by: Marko Kangas <marko.kangas@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | qdoc: Warn about non-existing sourcedirs and headerdirsTopi Reinio2016-04-061-2/+2
| | | | | | | | | | | | | | | | | | | | Enable warnings for source and header directories. This will also prevent adding an empty string into the list of resolved directories, which often results in unexpected behavior. Change-Id: I81d508b5cc8cf2bd033e712b575c1cca63d779ce Task-number: QTBUG-50601 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-04-0630-152/+300
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-04-0630-152/+300
| |\| | | | | | | | | | Change-Id: I06a1d65d1bcb0cdb0ae6e00e57283333aafbb673
| | * qdoc: Fix double backslash in link referenceOrgad Shaneh2016-04-061-1/+1
| | | | | | | | | | | | | | | Change-Id: I888354b968ad666d862871107b7eca69910d27a9 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| | * qdoc: Fix incorrect formatting of QML method signaturesTopi Reinio2016-04-051-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an issue that was addressed previously by 694d3003 (qtbase), but that was reintroduced by dab4877a (qtbase). Some QML methods are documented as having parameters without data types: bool grabToImage(callback, targetSize) QDoc was incorrectly inserting spaces after each name: bool grabToImage(callback , targetSize ) Fix the above, and format the typeless parameter names correctly (in italics). Change-Id: I3b61f7b3531c2cbf0e70cd88a3e91e6f7b0eea95 Task-number: QTWEBSITE-691 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| | * qdoc: Avoid trailing spaces in HTML <title>Topi Reinio2016-04-051-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Check whether the last string element (version info) in the title is empty before inserting a space. Change-Id: I5ade714f91b68d372e5b058701cf52ba4a515123 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| | * qdoc: Correct source line numbers in index fileMartin Smith2016-04-052-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many function clauses in the .index files show the wrong source file line number for the function declaration. This update ensures that the source file line number is correct. Change-Id: I8494b649be1d1a74e5b057391566503f3d6f1424 Task-number: QTBUG-52290 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Fix compiling windeployqt on linux targeting windows.David Schulz2016-03-302-2/+2
| | | | | | | | | | | | | | | Change-Id: If695c14ae178108abb9c374dc68f12583c103445 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * qdoc: Add Q_DECL_OVERRIDE to virtual functionMartin Smith2016-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers object now when a virtual function is not declared with override. Change-Id: Ia097af4ffecf896ffe42e5e22b6b9a0c1545f6f2 Task-number: QTBUG-52050 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| | * Qt Designer: No longer load layout icons from the icon theme.Friedemann Kleint2016-03-231-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It may happen that all layout icons look identical due to the lookup algorithm falling back to generic icons. For example, for both "designer-horizontal-layout" and "designer-vertical-layout" an identical icon "designer" may be returned. Task-number: QTBUG-43021 Task-number: QTCREATORBUG-15199 Change-Id: I7820566d38093381c9e3e1386b769a7200d67843 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Qt Designer: Refactor loading of the Edit menu theme icons.Friedemann Kleint2016-03-231-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move icon loading up to where the actions are created. Task-number: QTBUG-43021 Task-number: QTCREATORBUG-15199 Change-Id: I14177c6a8b2c7c0963f576b492ca7de3a48684d5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * Purge sRGB chunks from PNGsEdward Welbourne2016-03-224-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce (A couple of them needed -force, but did get smaller.) Change-Id: I91ade03e2b40cb69f8a4fa7ffe1f93e06a570364 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Assistant: Fix warnings about constructing/concatenating QString from char *.Friedemann Kleint2016-03-223-8/+8
| | | | | | | | | | | | | | | | | | | | | Use QLatin1Char/String where applicable. Change-Id: I8584ea79fb34b55ad99966e2dd959b95ab73fb18 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * qdoc: Provide better threadsafeness reportingMartin Smith2016-03-213-94/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation QObject reported the thread-safety of the class in a kind of silly way. It said "Note: All functions in this class are rentrant except for connect(), connect(), connect(), ..." This was confusing to the reader. Now it says "Note: All functions in this class are reentrant." And then it shows a second note that lists all the functions that are thread-safe in addition to being reentrant, but it lists them in a bullet list with their complete signatures, except for the return type. This affects a few other classes that had a similar problem. Change-Id: Icb7f7c5ac2da1c28ef8e5c10736296d80c2aefeb Task-number: QTBUG-41724 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>