summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in About dialogsv5.3.25.3.2Kai Koehne2014-09-044-8/+8
| | | | | Change-Id: I4c911c809c3779f7ac59917d5d88a38628817f67 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* macdeployqt: don't use hardcoded lib/ when searching for dylibSamuel Gaist2014-08-281-2/+1
| | | | | | | | | | | | | | | | Currently when parsing otool output for dylibs, "lib/" is appended to the path. However dylibs might not be always found in a lib folder like e.g. the mysql client libraries from macports. This patch aims to remove that hardcoded path and use the data from the currently parsed otool line. [ChangeLog][OS X][macdeployt] Fixed a bug where dynamic libraries where searched in the wrong directory Task-number: QTBUG-21913 Change-Id: I992d15bc48ad827185216852108b2d0a5633043e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* fix gaelic plural rulesOswald Buddenhagen2014-08-201-1/+10
| | | | | | | | | | | [ChangeLog][Linguist][Important Behavior Changes] The Gaelic plural rules now know four forms. To keep existing translations intact, set their language to Irish. Task-number: QTBUG-40566 Change-Id: Ia3c315bb4d9bda8fac57b39c9b1a5653a1a44260 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Add bearer plugin deploymentSamuel Gaist2014-08-041-0/+9
| | | | | | | | | | | This patch implement the bearer plugins deployement [ChangeLog][OS X][macdeployqt] Now correctly deploys the network related plugins Change-Id: I37e8a7033bc4d7d41fe34314ddac7b441696c5b7 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Android: fix zipAlign location.BogDan Vatra2014-07-311-3/+17
| | | | | | | | | Stating with android tools v23, the zipAlign tool was moved from <android_sdk>/tools to <android_sdk>/build-tools/<build_tools_version>. Task-number:QTBUG-40481 Change-Id: Id9207b6e382b0e79522d9fc529453ccd39aebe0d Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into ↵Oswald Buddenhagen2014-07-311-0/+18
|\ | | | | | | refs/staging/5.3
| * Merge remote-tracking branch 'origin/stable' into 5.3Oswald Buddenhagen2014-07-301-0/+18
| |\ | | | | | | | | | Change-Id: I8c3a43456ee3e378adbbda0d528d06201fd87256
| | * Ignore local and non-filesystem qml imports.stableMorten Johan Sørvig2014-07-031-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make macdeplpoyqt deploy qml imports from Qml2ImportsPath only. js and local imports should be deployed as a part of the application build. Remote (network) imports should be loaded at run-time. Task-number: QTBUG-38533 Change-Id: I322f588912bcbb65fbc45676faaa3de76d625bef Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | androiddeployqt: Force Qt Gui dependency for all appsEskil Abrahamsen Blomfeldt2014-07-311-0/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the only way to launch an Android application is through the platform plugin, which of course depends on Qt Gui. This causes problems running corelib autotests, since they have QT = core in the .pro file and thus will not deploy or load the platform plugin. At some point, we may have a way to launch pure corelib-applications on Android (like services), but until then, we need to hardcore the dependency on Qt Gui to make sure these autotests run properly. Change-Id: Ica794af972a06ec021c1fa28333866296eab96e0 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | windeployqt: Clear read-only attribute when copying files.Friedemann Kleint2014-07-101-4/+14
| | | | | | | | | | | | | | | | | | The deletion of the empty QML directories fails when not doing so. Task-number: QTBUG-40152 Change-Id: I0ff78440646239897b4867c3b3cfe1af8b2769f9 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | qtpaths: add missing GenericConfigLocation, exists since Qt 5.2.0David Faure2014-07-081-0/+1
| | | | | | | | | | | | Change-Id: I4d4ef2e0f33896984f436df6c9a033dd89866665 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | windeployqt: Added Qt 5.3 modules to module listOliver Wolff2014-06-261-26/+33
| | | | | | | | | | | | | | | | Additionally 64 Bit usage for the flags was cleaned up and the order of modules was changed so that they are sorted now. Change-Id: If5b52dee6e1f48218313db96a03ac1e5380e73ed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | winrtrunner: Prevent crash when closing run engineAndrew Knight2014-06-261-0/+1
| | | | | | | | | | | | | | | | | | Close the package factory before calling CoUnitialize(), as it may crash the application otherwise. Task-number: QTBUG-39833 Change-Id: I16108852dd259d981950dff6877ea83f8a471072 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I1cd3e87dbc75c3b2ae1bcaec7311ce8ceba530b5
* | Merge remote-tracking branch 'origin/stable' into 5.3v5.3.15.3.1Sergio Ahumada2014-06-147-6/+774
|\ \ | |/ | | | | Change-Id: I78a250e8631706606e6b003b28cdfb90ad692abc
| * winrtrunner: Support Windows Phone 8.1Andrew Knight2014-06-144-1/+662
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the runner to deploy to Windows Phone 8.1 devices and emulators. The following limitations are noted: - App argument passing doesn't currently work. A workaround could be to modify the entry point in the AppxManifest.xml, which would also require changes to qtmain. WP8.0 already uses a similar workaround, but this is messy and should be avoided if possible. - Querying for the application state doesn't work, so -wait won't exit if the app stops. A workaround for this exists in WP8.0, by passing the -qdevel parameter to the app, but this is invasive. If an alternative can't be found, this can be fixed in a follow- - Stopping applications doesn't appear to work (the API call succeeds, but the app remains running). One workaround is to -remove the app. - Getting the exit code still isn't possible. Task-number: QTBUG-37771 Change-Id: Ifa7188fc2ccb156e4c411b50fefd4f12a0590883 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * winrtrunner: Add an inherited method for creating packagesAndrew Knight2014-06-142-0/+93
| | | | | | | | | | | | | | | | This method can be used by AppxEngine subclasses for creating package (*.appx) files. Change-Id: I7aab9bced144353c3c9e8cf6fbb914bd2f5b7fbb Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * winrtrunner: Move COM initialization into the private classAndrew Knight2014-06-142-5/+19
| | | | | | | | | | | | | | This ensures Appx engine subclasses get COM initialized in the same way. Change-Id: Ib376842f808488353d19fe36c76bb2411332c0e4 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | windeployqt: Remove deleted QML directories from Json output.Friedemann Kleint2014-06-131-10/+28
| | | | | | | | | | | | | | | | | | Rewrite JsonOutput to use a QPair<> of strings and add function to remove all entries of a target directory. Task-number: QTBUG-39626 Change-Id: Ie4602deb45d60fdddab27f264ecf34b72f839254 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-1110-680/+905
|\ \ | |/ | | | | Change-Id: Ided10fa5438cc1bd9a34fd8ded4bbd456abfe686
| * Doc: Remove Qt Designer manual from the licensing groupTopi Reinio2014-06-101-1/+0
| | | | | | | | | | | | | | | | | | The Qt licensing information page will link to the Qt Designer -specific information directly. Task-number: QTBUG-35362 Change-Id: I293402a8024f33b68446497a50b9782803d20761 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * winrtrunner: Split AppxEngine into abstract base and Appx Local subclassAndrew Knight2014-06-057-677/+903
| | | | | | | | | | | | | | This allows common code to be reused in future Appx engine types. Change-Id: I4e0ba09242eee6687604abe65d556a96a79346f4 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * qhelpgenerator: Fix warning about qpa_minimal_plugin usageSergio Ahumada2014-06-051-1/+1
| | | | | | | | | | | | | | Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead. Change-Id: I9f07c5033e0022e00c45e52570fe001856f13ca8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * CoreCon: mark destructor as virtualAndrew Knight2014-06-051-1/+1
|/ | | | | | | | This was causing COM to not get uninitialized and resulted in winrtrunner hanging. Change-Id: Ie3e409a43f2cb41f28ef6975d81c68996554861f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* CoreCon: Support API Versioning, and add Version 12 (WP8.1) supportAndrew Knight2014-06-038-234/+596
| | | | | | | | | | | | | | | | While intrusive, versioned headers and a templated backend allows apps like winrtrunner and qtd3dservice to access multiple versions of CoreCon, allowing for simultaneous support of Windows Phone 8 and Windows Phone 8.1 devices. This also allows for simple addition of future versions, should there be a need. Applications using these headers should use the versioned API instead of the original ccapi.h. This has been fixed in winrtrunner and qtd3dservice. Task-number: QTBUG-37771 Change-Id: I70cad98a2bf7f232dfd92f1c068cf0e1a8eadf88 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* windeployqt: Observe qtlibinfix.Friedemann Kleint2014-05-281-4/+23
| | | | | | | | | Determine qtlibinfix by checking on the Qt5Core library name and re-apply that when building the module names. Task-number: QTBUG-39297 Change-Id: I73d1253ddd803071f90199fa9aaee7328c7aae8c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Iikka Eklund2014-05-271-7/+18
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableIikka Eklund2014-05-201-7/+18
| |\ | | | | | | | | | Change-Id: I2a54387a58f44518cddd5f5ac10c43cf29205d6b
| | * androiddeployqt: REG: Fix running tools with spaces in pathv5.3.0release5.3.0Eskil Abrahamsen Blomfeldt2014-05-141-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The popen() function on Windows executes the command using /s, probably for legacy reasons, which causes the behavior that it removes the first and last quotes in the command line and otherwise preserves it perfectly. This causes strings in which both the executable name and at least one argument has to be quoted, to be unparsable by the shell once it has been processed. To work around this we wrap the string in quotes on Windows. Since we added quotes to arguments for the jarsigner command in Qt 5.3.0 we introduced a regression that made it impossible to sign APKs on Windows. Task-number: QTBUG-38962 Change-Id: I2b618e1996753645766d25ca06b14e1985d7eacd Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | | Exclude qtdiag when QtGui is not available.Friedemann Kleint2014-05-231-2/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-39118 Change-Id: I54f6879ef58e5b7b7bc2c20840524f4af5433921 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | windeployqt: Add missing "audio" plugins for QtMultimedia.Friedemann Kleint2014-05-231-1/+1
|/ / | | | | | | | | | | Task-number: QTBUG-39157 Change-Id: I88055eed7b430c14e1d1e13bdeee558a63763d8d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | androiddeployqt: Add option to reinstall apkEskil Abrahamsen Blomfeldt2014-05-191-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly for consistency with the old deployment method in Qt Creator, androiddeployqt will uninstall any previously installed instances of the application before installing it. This will remove any caches or user data stored by the application. In many cases (most) it would be more convenient to just overwrite the existing instance, but keep all caches intact. This patch adds the --reinstall option, symmetrical to --install. If enabled, the uninstall step will be skipped. [ChangeLog][androiddeployqt] Added option to install an APK without uninstalling previous instances of same application. Task-number: QTBUG-35845 Change-Id: I93bed4fefda6ed5295f333002a4958654b3f911c Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Let qtpaths return a failure to the caller if it found nothingThiago Macieira2014-05-181-3/+6
| | | | | | | | | | | | | | | | | | | | Otherwise, the only hint that we get that nothing was found is an empty line. You could detect that from a shell by assigning to a variable and checking if it's empty (provided $IFS is set to a newline). But a return value is much easier. Change-Id: I00608be8a23a487c9f90a4080479c8f527a8eb3f Reviewed-by: David Faure <david.faure@kdab.com>
* | windeployqt: Consider plugin dependencies.Friedemann Kleint2014-05-151-23/+48
| | | | | | | | | | | | | | | | | | Pass the disabled libraries to the plugin find function and make it add new dependent Qt libraries. Task-number: QTBUG-38943 Change-Id: I5b4eaeb9f25dede738465ba19062f99bda15250b Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | androiddeployqt: Remove warning about missing dependencyEskil Abrahamsen Blomfeldt2014-05-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 08672adb97c0707c513850a27aaec59327874260 in qtbase, the MODULE_PLUGIN_TYPES of QtGui was expanded to contain some more plugin types which are not built on Android, causing warnings during every deployment. Since MODULE_PLUGIN_TYPES is common to all platforms we should just ignore it if it specifies plugins that do not exist. [ChangeLog][androiddeployqt] Remove warning about missing dependency. Task-number: QTBUG-38651 Change-Id: I57a2c1d79b859981b3adf2772be4f0cd8a98be12 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | windployqt: Fix cross-compilation.Friedemann Kleint2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | Fix signature of readPeExecutable(). Task-number: QTBUG-38160 Task-number: QTBUG-38886 Change-Id: I3ff88d502e0f9f7912b4c0741667a8f4ff71dbba Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove extra newline between the font listing and native dialogThiago Macieira2014-05-071-1/+1
| | | | | | | | | | | | | | They're all part of theme grouping. Change-Id: I1ecc6f4eee0abbcf4ac76f585b6524d6f7027a34 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Print the password character using the form U+XXXXThiago Macieira2014-05-071-1/+1
| | | | | | | | | | Change-Id: I5d901e6471509cb0f5177724d94912becf258182 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Explain what the * are in qtdiag's output or remove themThiago Macieira2014-05-071-3/+3
| | | | | | | | | | Change-Id: Ie5c43c88d51d282bde4e1d91e86b95e4e5c4e91f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Remove unused function from qtdiag.cppThiago Macieira2014-05-071-7/+0
| | | | | | | | | | | | | | qtdiag.cpp:175:20: warning: ‘QStringList toNativeSeparators(QStringList)’ defined but not used [-Wunused-function] Change-Id: I66c5d5d54aa1987393d3dc35c2ee4ff4f17af442 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | No longer deploy image files and sources of QML imports.Friedemann Kleint2014-05-062-8/+41
| | | | | | | | | | | | | | | | | | | | These files can be omitted for the Qt Quick Controls and Qt Quick Dialogs modules. Task-number: QTBUG-28766 Task-number: QTBUG-31565 Change-Id: Id02939a7124cd5db83d81dcc59663ddf4d091f70 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | androiddeployqt: Support bundling library projectsEskil Abrahamsen Blomfeldt2014-05-051-8/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Third party library projects can easily be added to the Android package source directory and added to the project using project.properties, but "android update" needs to be run on it to produce some local build files before it can be included in the build. We can do this for people so that they can use third party library projects without having to put build files in their source directory. [ChangeLog][Android][Deployment] Detect linked library projects in the package source directory and automatically run "android update" on these. Task-number: QTBUG-38322 Change-Id: I0bf9b8708a7ec28ed5429379215b12a65d05416a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-012-5/+6
|\ \ | |/ | | | | Change-Id: I311a5d7b5177dd0cea49ed2d4d9125b27d3ba5e0
| * Android: Fix deploy failed for debug modev5.3.0-rc1Yuchen Deng2014-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | E/dalvikvm(10899): dlopen("/data/local/tmp/qt/lib/libQt5Quick.so") failed: Cannot load library: soinfo_link_image(linker.cpp:1635): could not load library "libQt5Qml.so" needed by "libQt5Quick.so"; caused by load_library(linker.cpp:745): library "libQt5Qml.so" not found Task-number: QTBUG-38606 Change-Id: I8fcb42782a835842a69b0b4d2de4f1ed042555c6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Update qtdiag to use renamed symbolsLaszlo Agocs2014-04-281-4/+4
| | | | | | | | | | | | Change-Id: Ic2d40cf76efa63f12f2dde1a02c8938f355851b1 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Jani Heikkinen2014-04-252-5/+5
|\ \ | | | | | | | | | refs/staging/stable
| * \ Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-232-5/+5
| |\ \ | | |/ | | | | | | Change-Id: If733be66da6ef6b1e28ec6ba180beafea6c9990d
| | * Skip qtpaths on iOSTor Arne Vestbø2014-04-221-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie31615c62d228d23fab8d8eb5bcbcaf80957403e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * windeployqt: Fix check for MSVC 64 bit debug buildKai Koehne2014-04-111-4/+4
| | | | | | | | | | | | | | | | | | | | | Fix a regression introduced in commit e2710f83dfad87b938009. Change-Id: I2d5fc15cfd52a6901fa5e44b97af0996650da6dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | qtdiag: Dump writable locations of QStandardPaths.Friedemann Kleint2014-04-241-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | Indicate writable locations by asterisks. Task-number: QTBUG-38483 Change-Id: I3e5efbd6db032b4feaee2b5013a9304c6cbfc73d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
View Lorry Controller Status