Commit Graph

340 Commits (master)

Author SHA1 Message Date
an 2a8664e9bf add more trivial types 2019-07-10 06:05:58 -04:00
an 8a37b359ca *wow* 2019-07-10 05:07:10 -04:00
an 0faeaa0f91 fix format string errors 2019-07-10 05:01:05 -04:00
an f91bce56b8 wow 2019-07-10 04:54:31 -04:00
an 67d0eaec84 add QWidget base type 2019-07-10 04:46:02 -04:00
an d2eaa37ef5 Merge branch 'upstream' 2019-07-10 04:09:30 -04:00
an 598336e657 add before header include option 2019-07-03 22:50:28 -04:00
an fddfbd59c5 add base class property for objects 2019-07-03 22:33:40 -04:00
l10n daemon script 1d15f7df64 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-06-23 05:04:17 +02:00
l10n daemon script 874d6c36ce SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-06-03 05:24:26 +02:00
l10n daemon script dc1a874188 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-20 05:29:18 +02:00
l10n daemon script 542846edb1 GIT_SILENT made messages (after extraction) 2019-05-20 02:52:42 +02:00
l10n daemon script 85849808bf SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-16 05:54:42 +02:00
l10n daemon script e671db140a SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-14 05:46:38 +02:00
l10n daemon script 60801fbbc8 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-09 06:04:53 +02:00
l10n daemon script f44018095d SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-06 05:50:51 +02:00
l10n daemon script ab69230b6b GIT_SILENT made messages (after extraction) 2019-05-06 03:11:28 +02:00
l10n daemon script d056b04483 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-05 05:57:15 +02:00
Jonathan Riddell 2a0d25f07d add .desktop file used for kde.org/applications generator 2019-05-03 14:55:58 +01:00
Jos van den Oever 8691a9204b Update version and ChangeLog 2019-02-25 23:47:54 +01:00
Jos van den Oever 5c5126d84b Allow explicit adding of include directories and libraries to link 2019-02-25 23:47:00 +01:00
Jos van den Oever 39adad3b5e Update version and ChangeLog 2019-02-24 20:18:07 +01:00
Jos van den Oever ca98081000 Make it possible to specify C++ header files via mod build 2019-02-24 10:27:12 +01:00
Jos van den Oever c522870b79 Update version and ChangeLog 2019-02-13 08:10:19 +01:00
Jos van den Oever 10ddeda5cb Add placeholder variable name in generated code 2019-02-13 07:57:25 +01:00
Jos van den Oever 7e7d2f91ae Update version and ChangeLog 2019-02-08 22:02:08 +01:00
Jos van den Oever bba4964e31 Fix error where Cargo.toml could not be found
And improve the error message
2019-02-08 22:00:20 +01:00
Jos van den Oever ad94fb1036 cargo fmt 2019-01-22 00:03:50 +01:00
Jos van den Oever 1e4d769b32 Merge branch 'master' of git://anongit.kde.org/rust-qt-binding-generator 2019-01-21 23:45:14 +01:00
Jos van den Oever 0c67f8bc32 Update version to 0.3.0 2019-01-21 23:44:53 +01:00
Jos van den Oever 7c8bb6a535 Add function to choose what Qt modules to link to 2019-01-21 23:29:13 +01:00
l10n daemon script 092eb975e6 GIT_SILENT made messages (after extraction) 2019-01-01 03:04:38 +01:00
Jos van den Oever 0fb6e84077 Increase version to 0.2.2 and update ChangeLog 2018-12-10 00:36:14 +01:00
Jos van den Oever ecd135f311 Fix build with rust <= 1.30
A required lifetime was missing.
2018-12-10 00:32:20 +01:00
Jos van den Oever 86652e8605 Increase version to 0.2.1 and add ChangeLog 2018-12-10 00:22:26 +01:00
Jos van den Oever b41b1be336 Add anonymous parameter placeholders to generated code
As of Rust 1.31, missing parameter placeholders in functions
give a compile error. This commit adds more of them.
2018-12-10 00:12:49 +01:00
Jos van den Oever 319991e77f Add anonymous parameter placeholders to generated code
As of Rust 1.31, missing parameter placeholders in functions
give a compile error. This commit adds them.
2018-12-09 23:45:46 +01:00
Owen Nelson 325ffc2a2c Add support for Rust 2018 edition projects.
Summary:
After enabling 2018 edition on my cargo project, the use statements
generated in the interface module no longer resolve.

Prefixing module paths with `crate::` brings things back into alignment.

Unsure if this is how you'd like to approach the issue, but I'm happy to revise the patch based on your feedback.

Test Plan:
STEPS TO REPRODUCE
1. create a new cargo project based on the template
2. update your toolchain to >= 1.31
3. add `edition = "2018"` to the package section of your Cargo.toml
4. run `cargo build`

OBSERVED RESULT

Build fails since generated code tries to import crate-local modules as if they are top level crates.

EXPECTED RESULT

Build completes successfully.

Reviewers: vandenoever

Differential Revision: https://phabricator.kde.org/D17447
2018-12-09 23:34:40 +01:00
Jos van den Oever 4acf7e3176 Resolve resource path relative to qrc path 2018-11-24 12:46:47 +01:00
Jos van den Oever f678d441e9 Fix building with MSVC
BUG:400716
2018-11-11 16:03:29 +01:00
Carl Schwan ec81047ac1
Use pattern matching instead of if and else that return true and false
Differential Revision: https://phabricator.kde.org/D16576
2018-11-01 10:30:05 +01:00
l10n daemon script b8ebcfae05 GIT_SILENT made messages (after extraction) 2018-10-30 03:48:18 +01:00
Jos van den Oever e6d220bc18 Increase version number and add ChangeLog 2018-10-29 22:41:14 +01:00
Jos van den Oever 037322f270 Cleanup code 2018-10-29 22:40:57 +01:00
Jos van den Oever 89c86642f8 Print the c++ library that cargo should link against
This is used when calling "cargo build" when no actual recompile is needed.

BUG: 400393
2018-10-28 22:05:20 +01:00
Jos van den Oever ed2de05492 Add a template that is built by Cargo 2018-10-27 21:18:54 +02:00
Jos van den Oever c1a0bd7bfb Top processes have no parent 2018-10-26 11:28:08 +02:00
Jos van den Oever aa7e6c7e3b Remove unneeded enum value 2018-10-26 09:04:50 +02:00
Jos van den Oever 385ae17bb7 Pass the emitter as mutable. It is pointless otherwise. 2018-10-26 00:32:02 +02:00
Jos van den Oever fa337c37b1 Adapt code to changes in generator 2018-10-25 22:24:04 +02:00