summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Add customizable property tooltips.Friedemann Kleint2015-07-298-47/+228
| | | | | | | | | | | | | | | | - Introduce tag propertytooltip to property specifications in the ui XML snippet returned by QDesignerCustomWidgetInterface::domXml() - Pass the text to the property editor and set as description tooltip on the property. - As an added benefit, show the type in the normal tooltip. - Demonstrate using TicTacToe example. [ChangeLog][Qt Designer] Added customizable property tooltips. Task-number: QTBUG-45442 Change-Id: I371bbbb3a6f2bc0f433193b5eb45658211ca67de Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Qt Property Browser solution: Split toolTip into valueToolTip and ↵Friedemann Kleint2015-07-295-26/+75
| | | | | | | | | | | | | descriptionToolTip. Make it possible to have different tool tips for the property name and value. Add comments pointing out the changes to be ported back to the solution. Task-number: QTBUG-45442 Change-Id: I31571d3f502be20b7c0bb2c91cbd999e80ee49aa Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* windeployqt: Add option to suppress deployment of the software rasterizer.Friedemann Kleint2015-07-281-3/+13
| | | | | | | | | Add command line option --no-opengl-sw to suppress deployment of opengl32sw.dll. Task-number: QTBUG-47449 Change-Id: I2bf9aab98c9b56e62640da3fa13052ccc5f163d8 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Qt Designer: Clean up tooltips and value texts in property editor.Friedemann Kleint2015-07-281-9/+5
| | | | | | | | | | | | | | Remove code setting tooltips that duplicate texts already set in DesignerPropertyManager::valueText() (which is used as tooltip QtTreePropertyBrowserPrivate::updateItem(). Boolean values and the paths of icons and pixmaps are the only remaining tooltips that differ from valueText(). Fix display of the paths. Task-number: QTBUG-45442 Change-Id: Iedb5936e52f051f38c9922285efc5136387f4442 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* windeployqt: fix build under GCC/ClangAndrew Knight2015-07-281-0/+1
| | | | | Change-Id: I11d9e930474715ad87ff4968fe4f90f24c78cd27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* androiddeployqt: Make it QT_NO_CAST_*_ASCII cleanAndrew Knight2015-07-282-32/+34
| | | | | | | | | | This makes the codebase more consistent. Where appropriate, const was also added to local variables. Found by compiling Qt with QT_NO_CAST_FROM_ASCII/QT_NO_CAST_TO_ASCII. Change-Id: If36859b74c2320265702bb8b357248e8777f0ae9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* winrtrunner: Build under MSVC 2015Andrew Knight2015-07-282-2/+2
| | | | | Change-Id: I59086cfe94b471eef1c11f0ba3f21e8fc8e34640 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-07-285-34/+60
|\ | | | | | | Change-Id: Ib9420b128e30984aebf1f8eba8c0496e3913e69f
| * Prospective fix to make lupdate tests pass.Friedemann Kleint2015-07-271-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress the qmake message about creating a .stash file. This should fix failures like: FAIL! : tst_lupdate::good(heuristics) Output for /Users/qt/work/qt/qttools/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt does not meet expectations: <<<<<<< got Info: creating stash file /Users/qt/work/qt/qttools/tests/auto/linguist/lupdate/testdata/good/heuristics/.qmake.stash ========= >>>>>>> expected Change-Id: I1f7737e7f8463fcd92a4faf7f87a484de72d0921 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * windeployqt: Add QtWebChannel as a module that can be specifiedAndy Shaw2015-07-271-2/+4
| | | | | | | | | | Change-Id: I76d7b871facf27af15036cfa48e4e7881a42aec2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * windeployqt: Deploy MSVC debug runtime dlls instead of redist package.Friedemann Kleint2015-07-241-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | The redistributable package only contains the release mode DLLs, so it does not make sense for debug builds. Deploy DLLs instead for debug builds. [ChangeLog][windeployqt] windeployqt now deploys the MSVC debug mode runtime dlls instead of the redistributable package for debug builds. Change-Id: I84e0ec784c3dde72f206ce69dcaf1169d0fe0fef Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * macdeployqt: Fix typo in help outputKai Koehne2015-07-231-1/+1
| | | | | | | | | | Change-Id: I4993a21c6544edf289e5ee6aa084647c4ad6e4b5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * windeployqt: Adapt to MSVC 2015.Friedemann Kleint2015-07-211-9/+12
| | | | | | | | | | | | | | | | | | The name of the runtime libraries changed to VCRUNTIME140[D].DLL. Task-number: QTBUG-47334 Change-Id: Ibe9234e91801730afb2c0015abe94458fe22ba0f Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * windeployqt: Deploy new webengine resourcesKai Koehne2015-07-151-1/+4
| | | | | | | | | | | | | | | | See change 7345ef65af262eb0b958905d7175cc836821cf25 in qtwebengine. Task-number: QTBUG-47018 Change-Id: I325885dbdce1fa3c6130ad6c6271366bdb430d27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * windeployqt: Deploy plugins in platforminputcontexts for QtGui.Friedemann Kleint2015-07-141-1/+2
| | | | | | | | | | Change-Id: I7fe4d21b078bf2e0812acb0f688fb64cb4fdfddb Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * windeployqt: Fix deployment of Q53DInput.dllTobias Koenig2015-07-091-1/+1
| | | | | | | | | | | | | | Fix the typo in the name of the DLL. Change-Id: I81df26d837c3294852eba688db701503f95aad66 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Fix -Wcast-qual warnings found by GCCThiago Macieira2015-07-091-3/+3
| | | | | | | | | | | | | | ...by switching to static_cast Change-Id: Iee8cbc07c4434ce9b560ffff13cef3f916f521a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Port Qt Designer to Qt 5 signals & slot connection syntax.Friedemann Kleint2015-07-14112-704/+858
| | | | | | | | | | | | | | | | Use Qt 5 signals & slot connection with exception of private slots and tool classes from the shared directory. Change-Id: I2bf4bfbdff709d15c8ee4ae3de3039bf3d210d6a Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Qt Designer: Disambiguate signal/slot names in action editor.Friedemann Kleint2015-07-132-20/+22
| | | | | | | | | | | | | | | | | | | | Classes ActionListView/ActionTreeView overload the signals/slots of the item views they inherit with action parameters, making porting to the new signals&slot connection syntax unnecessarily difficult. Change the names to contain the word action. Change-Id: If8b9433e6ec14c5d68ee228a710c70057457324e Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Don't pass int by-ref in foreachSergio Martins2015-07-091-2/+2
| | | | | | | | | | Change-Id: I78753657aed14969fc35614ffba7cf480609c7de Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-2918-61/+404
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2424cf97743b3f998bf7b10a21f8075ed76b613f
| * Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | Change-Id: I97bd7a6de4a0fa51789c0cee8cf0703e32429f6f
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-268-52/+115
| |\ | | | | | | | | | Change-Id: Idc7ad0119c9b37908fc432b31163a9b9e8f45734
| | * windeployqt: Fix MSVC debug/release detection for WinRT.v5.5.0-rc1v5.5.05.5.0Friedemann Kleint2015-06-151-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 6c8954b07807e31dbc8967ba6d92d4d022073087 caused WinRT modules to be detected as release always since the runtime libraries there are called msvcp120d_app.dll / msvcp120_app.dll. Change the algorithm to check on the first character after the version number. Change-Id: I7eb645e9b94f21dd8daaf24f59009cc9c6f18c4c Task-number: QTBUG-46629 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| | * macdeployqt: Fix rpath setting for additional executablesEike Ziller2015-06-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional executables can lie anywhere within the app bundle, so we have to individually calculate the corresponding rpath instead of hard coding to @loader_path/../Frameworks. Task-number: QTBUG-46660 Change-Id: If213ad002b38a6690a30e7aeae47e201fdc4800c Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| | * windeployqt: Detect -release -force-debug-info MSVC builds as release.Friedemann Kleint2015-06-141-29/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out detection logic into a template for 32/64bit. When a debug entry is detected, detect release if the library positively uses the release runtime dll. Task-number: QTBUG-46629 Change-Id: Ic34c2e3850e7f1945086da87867934c502026a2e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * macdeployqt: fix plugin deployment.Morten Johan Sørvig2015-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set deploymentInfo.deployedFrameworks again, which was accidentally removed by ad31b989. (The plugin deployment logic uses deployedFrameworks to determine which plugins to deploy.) Task-number: QTBUG-46494 Change-Id: I0d6168cc8e646d519578d24dc0a35f0836d3be7b Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| | * Fix CLucene compile error with VS 2015.Karsten Heimrich2015-06-046-17/+36
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-45961 Task-number: QTBUG-45976 Task-number: QTBUG-46344 Change-Id: Ic001298e96ae474a4939c445b7816a331135dd53 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | windeployqt: Fix broken deployment of ANGLE.Friedemann Kleint2015-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 48b5cb2e682fd58e60b5650366c0291020e8b264 (windeployqt: Add support for x86 based WinCE) broke the if condition as revealed by g++: main.cpp: In function 'DeployResult deploy(const Options&, const QMap<QString, QString>&, QString*)': main.cpp:1189:77: warning: 'and' of mutually exclusive equal-tests is always 0 if ((options.platform & WindowsBased) && !(options.platform & WinCEIntel) && !(options.platform & WinCEArm) && !qtGuiLibrary.isEmpty()) { Change-Id: I91e8d4b93b1060330bff883f5eaa4eacc27e474f Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Add auto test for windeployqt.Friedemann Kleint2015-06-156-1/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy test application and launch in clean environment with qt.conf to verify that deployment works. Task-number: QTBUG-46629 Change-Id: I3b73354b95e7e5c55c8f30991fbc9f7443176079 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * | qtdiag: Add new capabilities/style hints for Qt 5.5.Friedemann Kleint2015-06-111-1/+8
| | | | | | | | | | | | | | | Change-Id: I88bd49fb6b426a061f24b759cfa17553bfa90a3c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Add missing private headers warningSamuel Gaist2015-06-081-0/+11
| | | | | | | | | | | | | | | Change-Id: I61cecd5065d4bb3b32dd7b50cbfe866071e76dbe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | windeployqt: Print warning when MinGW runtime cannot be found.Friedemann Kleint2015-06-081-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-46458 Change-Id: I102eb6b902e9f59e7abacae611b5ad32dbe64eeb Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * | windeployqt: Add support for x86 based WinCETobias Koenig2015-06-032-6/+12
| |/ | | | | | | | | | | | | | | | | | | Adapt windeployqt to support x86 based WinCE systems in parallel to arm based WinCE systems. Change-Id: I855db447524ebc55c68af5eaecbf9f6a448d9ed8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
* | Linguist: bring currently translated widget to frontLuca Niccoli2015-06-191-0/+20
| | | | | | | | | | | | Task-number: QTBUG-6713 Change-Id: I5ab5ee05a2257ff0978dd20bad5bdcf29e57159c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-03191-1048/+1261
|\ \ | |/ | | | | Change-Id: Ie29b7ff968808d1cca2864016445bc1c973a124f
| * Qt Designer: Disambiguate the modules where widgets come fromSze Howe Koh2015-05-292-2/+2
| | | | | | | | | | | | | | | | | | | | - QWebView is from "Qt WebKit Widgets", not "Qt WebKit", "Qt WebView" or "Qt WebEngine Widgets" - QQuickWidget is for Qt Quick 2, not Qt Quick 1 Change-Id: Ifd3395cbbe632b0d17b37658044318ddf04770c9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Linguist: do not override the roles of Edit menu itemsShawn Rutledge2015-05-291-12/+0
| | | | | | | | | | | | | | | | | | | | The menu items were staying disabled whenever the File dialog is open, so it was not possible to use them to cut/copy/paste into the native FileDialog (or its child sheets) on OS X. Task-number: QTBUG-17291 Change-Id: I0b821bd85d6d614ad845f594e4d8d994e1386d94 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-05-257-1/+99
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I47fe486745efad44537255a56087f4ec0a3b2e82
| | * invalidate message index when inserting in the middleOswald Buddenhagen2015-04-305-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subsequent offsets become invalid when a message is inserted in the middle, so the index must be invalidated (adjusting the offsets on the fly doesn't seem worth it). also, there is no point in updating the index if it is already invalid. Task-number: QTBUG-45831 Change-Id: I9733cb3235c6b8b09dee7eae4d2ecf0a0cdda528 Reviewed-by: hjk <hjk@theqtcompany.com>
| | * update message index when message gains source textOswald Buddenhagen2015-04-303-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a message which is first seen with only an id later gains a source text, this text would not have been indexed. so a subsequent new message with the same source, but without an id this time around, would not be seen as a dupe of the first message. Change-Id: Ib35f820e2b02311ea9c9996383a2789095098d6f Reviewed-by: hjk <hjk@theqtcompany.com>
| | * Bump versionOswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | Change-Id: Ib3ce9b642f65dc89847a61332d00ff9cde04d596
| * | Fix the include for QQuickWidgetjkobus2015-05-221-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-46139 Change-Id: I499b2fdaaf2ca72350a83a5a8a75eac94f0bcd76 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | Fixup "androiddeployqt: Use correct package name when uninstalling"Alessandro Portale2015-05-211-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit 30329ce24004a54e0bd1bbeff2b139ab13bb6946, making sure that updateAndroidManifest() works as it did before. Change-Id: Ia6c28985224ffaa36063e7195e32864c4ce0b67e Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | Updated WinRT license headers to use LGPLv3 instead of LGPLv21Jani Heikkinen2015-05-2011-110/+143
| | | | | | | | | | | | | | | | | | | | | | | | From 5.5.0 -> WinRT port is licensed with LGPLv3, see http://blog.qt.io/blog/2015/04/29/windows-10-support-in-qt/ Change-Id: Idd2bd07705a9ccdc80d22e896acc42141a96d3ee Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * | Qt Designer: Fix widget box settings.Friedemann Kleint2015-05-191-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The group name was used with incorrect case, which no longer works in Qt 5/Linux. Task-number: QTBUG-46201 Change-Id: I2be0eb74058dc2c7f5d36b0c5c53d04e50b41b36 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| * | Qt Designer: Update widget box labelsSze Howe Koh2015-05-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use correct names for 3rd-party technologies ("OpenGL") - Use appropriate capitalization ("MDI Area", "Key Sequence Edit") - Make labels as similar to the corresponding class names as possible (QDialogButtonBox, QCalendarWidget) Change-Id: I3d9b1b77b62444496589c7c4a80f3ffb86f27e67 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | Qt Designer: Introduce Q_DECL_OVERRIDE.Friedemann Kleint2015-05-13125-665/+665
| | | | | | | | | | | | | | | | | | | | | | | | Replacement done by a script and verified with clang 3.5 to not cause new warnings. Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| * | Update Qt Designer documentation.Friedemann Kleint2015-05-135-105/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Document new QUiPlugin module. - Fix example documentation to reflect the changes in the qmake variables (QT/CONFIG). Task-number: QTBUG-44724 Change-Id: Idd85d601295af25d634c3186e993abc7090fe002 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | MacDeployQt: handle "./" in app bundle nameMorten Johan Sørvig2015-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use QDir::cleanPath() to normalize the app bundle path. Change-Id: I35053507dd11de986b9f43276e41d9fe3eff0fca Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
View Lorry Controller Status