summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure the content widget never replaces valid data with empty data.5.3Christian Kandeler2014-10-061-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | This could happen because insertContents() is called once for every run of the content provider, even if an invalidation happens in between. Example sequence: run() invalidate() [removes result of first run] run() insertContents() [queued for first run, retrieves result of second run] insertContents() [queued for second run, retrieves empty data] We now check in insertContents() whether the content provider has a valid root item and do nothing if it does not. This means that insertContents() will never replace the current model data with empty data; only invalidateContents() can do that from now on. Further improvements: - Only call insertContents() if the run was not aborted; this reduces the number of useless objects in the event queue. - Remove the m_rootItem member; it was only used in the run() function. - Only add the root item to the list at the end of a successful run; there is no reason this object should be accessible from the outside while there are still children being added to it. Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Prevent re-deploying already deployed imports.Morten Johan Sørvig2014-10-011-0/+6
| | | | | | | | Check if the target directory exists before copying the import. Change-Id: Id729f26b4b887c7a3b209aa88649eca3fc73b0ba Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Work around legacy framework structures.Morten Johan Sørvig2014-10-011-0/+21
| | | | | | | | | | | | | Existing versions of qmake produce application bundles which are incompatible with OS X code signing. Deploy framework Info.plist files to the correct location. Patch them to remove any "_debug" suffix on the value for CFBundleExecutable. Task-number: QTBUG-32896 Change-Id: Id657e394f3bf919713a43e395e716bf46488c644 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Make deployed Qt Quick imports code signableMorten Johan Sørvig2014-10-011-1/+27
| | | | | | | | | | | | | The OS X code signing process enforces strict code/data separation. Split up the Qt Quick imports; deploy .dylibs to "Contents/Plugins/quick/", deploy .qml files and other resources to "Resources/". Create symlinks to the dylibs so that Qt Quick can load the imports as usual. Task-number: QTBUG-34810 Change-Id: If7e1f80b357598c8e3cc7dd46a9363387218d541 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add -codesign option.Morten Johan Sørvig2014-10-013-1/+149
| | | | | | | | | | | | | Use the "codesign" tool with the provided signing identity to sign all code binaries in the bundle. Application code binaries include the app executable(s), plugin and framework/dylib dependencies. Finally, run "codesign --verify" to verify that the app bundle is correctly signed. Change-Id: Idfff030a2b218e1dc1ad1bc279a32a330665b347 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix framework bundle deploymentMorten Johan Sørvig2014-10-012-44/+94
| | | | | | | | | | | | | | | | | | Rework copyFramework(). Split out dylib deployment into copyDylib(). Remove the special symlink handling. Always create symlinks from "Current" to the actual version. This ensures we're compatible with Apple's framework bundle spec [1]. It also makes the 'codesign' utility happy, easing the step to sandbox Qt OS X applications. [1]: https://developer.apple.com/library/mac/documentation/ macosx/conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html Task-number: QTBUG-32896 Change-Id: Ide23437c9bb6515d5013d37ae6ff4133a69085ad Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix crash when accessing the content model.Christian Kandeler2014-09-194-8/+16
| | | | | | | | | | | | 1) Make sure invalidateContents() is called whenever the help engine's DB readers are destroyed. 2) In QHelpContentProvider::stopCollecting(), remove all root items, as they are invalid now: Their child items reference DB readers that are going to be destroyed. Task-number: QTBUG-18829 Change-Id: Id9cc4ea99c43c36ad5c5d1f04157a68bac79d44a Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/5.3.2' into 5.3Frederik Gladhorn2014-09-174-8/+8
|\ | | | | | | Change-Id: I75765dd8b4ebe39933da89933df1d61ae209e0cd
| * 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>
* | fix context checkmarksOswald Buddenhagen2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | not such a good idea to not count finished messages towards non-obsolete ones. amends 9d3cbd0a. Task-number: QTBUG-34921 Change-Id: I22d0dd14c094a33973635c23e59c66d72c6c746a Reviewed-by: hjk <hjk121@nokiamail.com>
* | remove pointless empty column in message listOswald Buddenhagen2014-09-021-2/+4
| | | | | | | | | | | | | | | | the view has one column less than the context list, so reflect that in the model. Change-Id: I51c87167bc334b47e4a35874a476823db4908790 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Bump versionFrederik Gladhorn2014-08-291-1/+1
|/ | | | Change-Id: Ib882880ca853660bdd3cd6388d4e94b020e87ce3
* 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>
View Lorry Controller Status