summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update the documentation URLs in man pages5.5Dmitry Shachnev2015-11-192-2/+2
| | | | | | Change-Id: I8d4e51391bb725e38cf0bceef28e90267a0da1b9 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* windeployqt: Clear argument list of lconvert in locale loop.Friedemann Kleint2015-10-231-0/+1
| | | | | | | | Otherwise, the arguments accumulate. Task-number: QTBUG-48946 Change-Id: I9670f98a75a2ec7131fb1ad5ebfefd3ed6c35469 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* windeployqt: Do not patch Qt5Core on WinRT/Windows Phonev5.5.15.5.1Oliver Wolff2015-09-151-6/+12
| | | | | | | | | | | | | | | | | | Patching the file causes the "Date modified" to be changed. When trying to deploy a package using Visual Studio, MSVC does not like the date/time difference between the file from the package and Qt's bin directory and thus refuses to deploy the package. As WinRT/Windows phone packages are sandboxed and have to be self- contained, patching Qt5Core is not that important on these platforms and can be omitted. Task-number: QTBUG-48236 Change-Id: I03404976efa0f343341b5d13708ebb864a3b8179 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> (cherry picked from commit 4a1cdd0acbef69257c3d604ca51a5868fb2f761c) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Android: Don't hardcode the output nameBogDan Vatra2015-09-011-1/+1
| | | | | Change-Id: I0e19587543cee3dde345a55b072885496ef0ce41 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-191-42/+0
|\ | | | | | | | | | | | | Conflicts: examples/designer/doc/src/arthurplugin.qdoc Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f
| * Doc: Removed the qdoc page for Arthur Plugin example5.4Venugopal Shivashankar2015-05-291-42/+0
| | | | | | | | | | | | | | | | The example was removed in 2d750edc Task-number: QTBUG-41996 Change-Id: I778ef5d3af53be73bba37d99498960d2f766a53f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: replaced Mac OS X with OS XNico Vertriest2015-08-173-4/+4
| | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: I3dd691ec1f17ae3217cb85e6f3e6330114ab7aa3 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Add the GPLv3 license textThiago Macieira2015-08-132-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>
* | macdeployqt: Work around broken QLibraryInfoMorten Johan Sørvig2015-08-132-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>
* | macdeployqt: Always print errorsMorten Johan Sørvig2015-08-131-1/+1
| | | | | | | | | | | | | | Don't require -verbose=1. Change-Id: I6c27c68635698984d8c1e2a1c4604a2b409d6b56 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | macdeployqt: halt on missing qmlimportscannerMorten Johan Sørvig2015-08-133-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>
* | macdeployqt: strip the application binaryMorten Johan Sørvig2015-08-133-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>
* | Add option for skipping use of private API.Morten Johan Sørvig2015-08-132-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>
* | macdeployqt: correct process return values.Morten Johan Sørvig2015-08-131-3/+5
| | | | | | | | | | | | Task-number: QTBUG-9332 Change-Id: I684f640d38326f6607669501e0b20be663692fc3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | macdeployqt: Workaround for QtQuick.PrivateWidgetsMorten Johan Sørvig2015-08-131-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>
* | macdeployqt: fix QML import deps deploymentMorten Johan Sørvig2015-08-133-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>
* | Fix QML imports deployment when using pathMorten Johan Sørvig2015-08-133-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>
* | windeployqt: Patch qt_prfxpath when deploying Qt5CoreKai Koehne2015-08-033-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>
* | Update the processor feature reporting in qtdiagThiago Macieira2015-08-011-0/+4
| | | | | | | | | | | | | | Don't try to report on features from the wrong processor Change-Id: Ib306f8f647014b399b87ffff13f2426ce9047e98 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | 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>
* | 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>
* | 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>
View Lorry Controller Status