summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-09-01winrtrunner: Use noquote() for all messages with file names.v5.5.90+alpha1upstreamFriedemann Kleint3-12/+18
The quote mode causes '\' to be output as '\\'. Turn it off, add double quotes manually and use QDir::toNativeSeparators() consistently. Change-Id: I1738c64aca106d7e450ab8a5a40adc9a4595f062 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
2015-08-31qtdiag: Output environment variables starting with 'Q'.Friedemann Kleint1-0/+8
Obtain information on high DPI scaling and other variables influencing Qt. Change-Id: Ia3eb5eb1fb34276ff15a6dea49b2120bfcb107b7 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-08-28Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi8-74/+812
Change-Id: Ic1c578187b99013c40fe686f98fc85d5917240fe
2015-08-27qtdiag: Output information on HiDpi scaling.Friedemann Kleint1-4/+7
Task-number: QTBUG-46615 Change-Id: Iff96ca3c715a93f3e1e02c8896cfa9cccc7b7eba Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
2015-08-26qtdiag: Adapt to Qt 5.6.Friedemann Kleint1-4/+12
Output QPlatformScreen::powerState(), QPlatformScreen::pixelDensity() and usage of native message dialog. Change-Id: Iddde2ee93817fa33f381640475a04aeb76f88438 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-08-19Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi1-42/+0
Conflicts: examples/designer/doc/src/arthurplugin.qdoc Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f
2015-08-17windeployqt: Fix handling of the --no-webkit2 option.Friedemann Kleint1-1/+1
The option formerly was a boolean value and one if-statement was overlooked when changing it into an enumeration value of type ExlusiveOptionValue. Task-number: QTBUG-47785 Change-Id: I6135a6268221841025fd05928cea50ffa6fbdea9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-08-17Doc: replaced Mac OS X with OS XNico Vertriest3-4/+4
Task-number: QTBUG-40759 Change-Id: I3dd691ec1f17ae3217cb85e6f3e6330114ab7aa3 Reviewed-by: Martin Smith <martin.smith@digia.com>
2015-08-13Add the GPLv3 license textThiago Macieira2-0/+688
LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-08-13macdeployqt: Work around broken QLibraryInfoMorten Johan Sørvig2-2/+13
Add fallback code path for locating qmlimportscanner relative to the macdeployqt binary. Task-number: QTBUG-46404 Change-Id: I9c837b5da518af45cef1292f9cd0422fccba8e5f Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
2015-08-13macdeployqt: Always print errorsMorten Johan Sørvig1-1/+1
Don't require -verbose=1. Change-Id: I6c27c68635698984d8c1e2a1c4604a2b409d6b56 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-13macdeployqt: halt on missing qmlimportscannerMorten Johan Sørvig3-6/+11
This is going to produce a broken bundle; stop and print the error. Change-Id: Ie58d357b97adc229393d80e9dde5e10c65c9bc99 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-13macdeployqt: strip the application binaryMorten Johan Sørvig3-0/+9
In addition to running 'strip' on the framework and plugin binaries. Change-Id: I90b1f50f8212d1399933d4cd5c35aaee8e5212f2 Task-number: QTBUG-17447 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-13Add option for skipping use of private API.Morten Johan Sørvig2-2/+25
The qsqlodbc and qsqlpsql are known to cause rejections from the Mac App store due to use of private/deprecated API. The plugins are deployed whenever the SQL module is used. Due to this corse granularity of plugin selection apps may find themselves rejected for plugins which they are not actually using. Make macdeployqt print a warning when sqlodbc or sqlpsql is deployed. Add "-appstore-compliant" which will skip deployment of the plugins. Task-number: QTBUG-37835 Task-number: QTBUG-38607 Change-Id: I7325156ffaf228a97d7ceeb12f329b3f10db4ff2 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-13macdeployqt: correct process return values.Morten Johan Sørvig1-3/+5
Task-number: QTBUG-9332 Change-Id: I684f640d38326f6607669501e0b20be663692fc3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-13macdeployqt: Workaround for QtQuick.PrivateWidgetsMorten Johan Sørvig1-0/+20
Deploy PrivateWidgets if QtWidget.framework and QtQuick.Controls is in use. Task-number: QTBUG-45977 Change-Id: Id2d7af8895be136d84bed92043fc790b156d8dea Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-13macdeployqt: fix QML import deps deploymentMorten Johan Sørvig3-8/+31
The plugin deployment step needs to run after QML imports deployment in order to take frameworks added by QML imports into account. Move deployPlugins() down. Update deploymentInfo. deployedFrameworks after deployQmlImports() has run. Change-Id: I1d9ce827b1c0205ec37f027d03a9b4a2bb846801 Task-number: QTBUG-46981 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-13Fix QML imports deployment when using pathMorten Johan Sørvig3-9/+8
During deployment the value of LC_RPATH on the main executable gets updated with a new value pointing inside the app bundle. This happens before QML import deployment, which means reading LC_RPATH at QML import deployment time will not give the correct value. Use the cached value stored in the DeploymentInfo structure instead, which will point back to the Qt installation. Task-number: QTBUG-47390 Change-Id: Ide84240de408d2338c9f7a68a73849263ce69dff Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2015-08-09Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn4-0/+61
Change-Id: I53ac9eae2c1d1ccc7ab027146f354f19a3a6d2b8
2015-08-03windeployqt: Patch qt_prfxpath when deploying Qt5CoreKai Koehne3-0/+57
Patch the preconfigured Qt path in Qt5Core to '.'. This allows one to immediately test whether the generated package is self-contained, without Qt being able to 'fall back' to the installed Qt for loading plugins. It is also fixing a potential security issue where Qt tries to load plugins from 'unexpected' places. The effect is the same as adding a qt.conf file with all the defaults. However, a lot of people consider adding a qt.conf ugly. [ChangeLog][Important behavior changes][windeployqt] windeployqt now changes the hardcoded QLibraryInfo::PrefixPath in Qt5Core to be relative to the executable. Change-Id: Ib59d84453913f28b806ae78a0ef138eb4f0045fa Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-08-01Update the processor feature reporting in qtdiagThiago Macieira1-0/+4
Don't try to report on features from the wrong processor Change-Id: Ib306f8f647014b399b87ffff13f2426ce9047e98 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-07-29Qt Designer: Add customizable property tooltips.Friedemann Kleint8-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>
2015-07-29Qt Property Browser solution: Split toolTip into valueToolTip and ↵Friedemann Kleint5-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>
2015-07-28windeployqt: Add option to suppress deployment of the software rasterizer.Friedemann Kleint1-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>
2015-07-28Qt Designer: Clean up tooltips and value texts in property editor.Friedemann Kleint1-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>
2015-07-28windeployqt: fix build under GCC/ClangAndrew Knight1-0/+1
Change-Id: I11d9e930474715ad87ff4968fe4f90f24c78cd27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-07-28androiddeployqt: Make it QT_NO_CAST_*_ASCII cleanAndrew Knight2-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>
2015-07-28winrtrunner: Build under MSVC 2015Andrew Knight2-2/+2
Change-Id: I59086cfe94b471eef1c11f0ba3f21e8fc8e34640 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-07-28Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann5-34/+60
Change-Id: Ib9420b128e30984aebf1f8eba8c0496e3913e69f
2015-07-27Prospective fix to make lupdate tests pass.Friedemann Kleint1-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>
2015-07-27windeployqt: Add QtWebChannel as a module that can be specifiedAndy Shaw1-2/+4
Change-Id: I76d7b871facf27af15036cfa48e4e7881a42aec2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-07-24windeployqt: Deploy MSVC debug runtime dlls instead of redist package.Friedemann Kleint1-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>
2015-07-23macdeployqt: Fix typo in help outputKai Koehne1-1/+1
Change-Id: I4993a21c6544edf289e5ee6aa084647c4ad6e4b5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-07-21windeployqt: Adapt to MSVC 2015.Friedemann Kleint1-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>
2015-07-15windeployqt: Deploy new webengine resourcesKai Koehne1-1/+4
See change 7345ef65af262eb0b958905d7175cc836821cf25 in qtwebengine. Task-number: QTBUG-47018 Change-Id: I325885dbdce1fa3c6130ad6c6271366bdb430d27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-07-14windeployqt: Deploy plugins in platforminputcontexts for QtGui.Friedemann Kleint1-1/+2
Change-Id: I7fe4d21b078bf2e0812acb0f688fb64cb4fdfddb Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-07-14Port Qt Designer to Qt 5 signals & slot connection syntax.Friedemann Kleint112-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>
2015-07-13Qt Designer: Disambiguate signal/slot names in action editor.Friedemann Kleint2-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>
2015-07-09Don't pass int by-ref in foreachSergio Martins1-2/+2
Change-Id: I78753657aed14969fc35614ffba7cf480609c7de Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2015-07-09windeployqt: Fix deployment of Q53DInput.dllTobias Koenig1-1/+1
Fix the typo in the name of the DLL. Change-Id: I81df26d837c3294852eba688db701503f95aad66 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-07-09Fix -Wcast-qual warnings found by GCCThiago Macieira1-3/+3
...by switching to static_cast Change-Id: Iee8cbc07c4434ce9b560ffff13cef3f916f521a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-06-29Merge remote-tracking branch 'origin/5.5' into devLiang Qi18-61/+404
Conflicts: .qmake.conf Change-Id: I2424cf97743b3f998bf7b10a21f8075ed76b613f
2015-06-29Bump versionOswald Buddenhagen1-1/+1
Change-Id: I97bd7a6de4a0fa51789c0cee8cf0703e32429f6f
2015-06-26Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi8-52/+115
Change-Id: Idc7ad0119c9b37908fc432b31163a9b9e8f45734
2015-06-19Linguist: bring currently translated widget to frontLuca Niccoli1-0/+20
Task-number: QTBUG-6713 Change-Id: I5ab5ee05a2257ff0978dd20bad5bdcf29e57159c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-06-15windeployqt: Fix MSVC debug/release detection for WinRT.Friedemann Kleint1-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>
2015-06-15macdeployqt: Fix rpath setting for additional executablesEike Ziller1-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>
2015-06-15windeployqt: Fix broken deployment of ANGLE.Friedemann Kleint1-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>
2015-06-15Add auto test for windeployqt.Friedemann Kleint6-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>
2015-06-14windeployqt: Detect -release -force-debug-info MSVC builds as release.Friedemann Kleint1-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 20:16:46 +0000