| Age | Commit message (Collapse) | Author |
|---|
|
Needed for many unit tests to add them to APK files.
REVIEW: 128175
|
|
Summary:
Instead of using "share" use "${BIN_INSTALL_DIR}/data" on Windows,
this is the location provided by QStandardPaths for GenericDataLocation
on Windows.
Reviewers: dfaure
Reviewed By: dfaure
Subscribers: kfunk
Differential Revision: https://phabricator.kde.org/D1873
|
|
|
|
|
|
Just setting the field android-extra-plugins to an empty string resulted
in androiddeployqt complaining about
"External resource does not exist or not a correct directory!"
so the field is completely left out now if no plugin data dirs are found.
For consistency the same is done with the android-extra-libs field.
REVIEW: 127700
BUG: 362578
Thanks apol for review
|
|
|
|
Better wait a little until applying this change, since this might break
assumptions, and we don't know yet if all distros are using a recent enough
AppStream (Generator) release.
This reverts commit 4b7a90bfe7a3e2eb3ae83c946c182a79fabc51e3.
|
|
As per AppStream release 0.9.4
|
|
Make Qt and ECM-based projects use the same directory sctructure (i.e.
where plugins are, libs, etc.) by default. Otherwise it creates a tiny mess
that might be controlled but usually won't.
In the end, otherwise, people need to keep adapting their systems with
environment variables anyway. All distros end up setting always this
setting as ON, as well as brave developers who don't have separate prefixes
for Qt and KDE.
REVIEW: 127169
|
|
including
If one subdir in the project includes this file, all others can use the function
but they don't see the value of the variable, which leads to a strange error
CMake Error at ECM/modules/ECMQtDeclareLoggingCategory.cmake:114 (configure_file):
configure_file input location <srcdir> is a directory but a file was expected.
Happened in KIO, with kio/gui doing include+function call, and then adding
function call in kio/widgets.
REVIEW: 127432
|
|
Clang automatically adds its runtime library (librt) when given the
-fsanitize options. Do not force the GCC runtime libraries (asan, tsan,
lsan), this results in "Your application is linked against incompatible
ASan runtimes." errors when using the library in an executable built
using Clang.
Acked by Mathieu Tarral
REVIEW: 127513
|
|
Use the CMAKE_INSTALL_PREFIX to ensure that only a file in the install
location will be touched. Otherwise a user running
make install
as root would create root-owned files in the build directory.
Use the cmake -E touch command to update the mtime of the directory.
That command exists since late 2007, but this manual file creation
workaround pre-dates that by a few months (kdelibs SVN revision 691973).
There is no chance any calling code is already passing an absolute path
here because later in the function it is already used together with a
CMAKE_INSTALL_PREFIX.
Inspired-by: REVIEW 127445
|
|
This reverts commit 1d4bc35cf9383177459544d6fcd9de35edf3e77d.
QLoggingCategory has always included QDebug, so this has always been
superfluous.
|
|
|
|
|
|
FindPoppler wasn't available in ecm < 5.19
CCMAIL:faure@kde.org
|
|
REVIEW: 126711
|
|
REVIEW: 126711
|
|
The only reason why it used to work, is because all libraries we're including,
provide *Config.cmake files, which don't respect this setting.
REVIEW: 126896
|
|
At least Okular and KBibTex include a FindPoppler.cmake module but this one
uses the new ECMFindModuleHelpers and has imported targets.
REVIEW: 126183
|
|
This is required to find poppler without package config as all the headers
are installed in a poppler subdirectory of the include directory
|
|
|
|
templates are very useful as teaching tool in order to make
a minimal application that uses a certain framework.
templates in the KAppTemplate repository will always get forgotten
(plus kapptemplate is not really necessary as they work in kdevelop as well)
An ideal situation would be frameworks having templates in their own repos
with templates of barebone apps using the main framework features.
In order to do that, the cmake stuff needed in order to correctly install
a template needs to be ported to a place avaiable to all frameworks
REVIEW:126185
|
|
We recommend including KDE "settings" modules with NO_POLICY_SCOPE, both
so we can resolve this issue and to allow us to deal with similar things
in the future.
REVIEW: 126535
|
|
In order to use the logging categories created by ECM,
the generated header file has to be included but then
also #include <QDebug> must be added to make it usable
at all for qCDebug/qCWarning stuff.
So this puts the #include <QDebug> into the generated
header file and thus allowing to include a single header
for qCDebug/qCWarning instead of two.
REVIEW: 126368
|
|
REVIEW: 126414
|
|
Example:
CMake Warning (dev) at
Z:/kderoot/share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake:50(elseif):
Policy CMP0054 is not set: Only interpret if() arguments as variables or
keywords when unquoted. Run "cmake --help-policy CMP0054" for policy
details. Use the cmake_policy command to set the policy and suppress this
warning.
REVIEW: 126405
|
|
|
|
|
|
This reverts commit 1e8e0da3eb475bb8b78baa54cb0c34b913c2dc5d.
I don't want this going into a release without further review, as well
as documentation and tests, so I'm reverting it (at least temporarily).
See emails on kde-commits mailing list for further rationale.
CCMAIL: notmart@gmail.com
|
|
This technically works and is practiced, e.g. for some Breeze icons.
Some SVG icons do not scale well down from 32 to 22 or up from 16 to 22.
For such cases icons are typically specially crafted for 22 and 16, at least.
Then there's no single icon that be marked as "sc".
So warnings such as:
CMake Warning at ..../ECMInstallIcons.cmake:272 (message):
Fixed-size icon foo.svg is not PNG or MNG
... are misleading.
This change adds SVG(Z) extensions to the list of allowed icons for specific sizes.
REVIEW:126199
|
|
|
|
Because the old implementation (accidentally) worked when you put the
ecm_create_qm_loader call in a different CMakeLists.txt file to the
target the file was added to, some projects did this.
This won't work with build-time-generated files, though, like moc files.
So we (ab)use QTimer events to make the loading happen on the main
thread.
BUG: 346188
REVIEW: 126000
|
|
templates are very useful as teaching tool in order to make
a minimal application that uses a certain framework.
templates in the KAppTemplate repository will always get forgotten
(plus kapptemplate is not really necessary as they work in kdevelop as well)
An ideal situation would be frameworks having templates in their own repos
with templates of barebone apps using the main framework features.
In order to do that, the cmake stuff needed in order to correctly install
a template needs to be ported to a place avaiable to all frameworks
REVIEW:126185
|
|
It should now be easier to read, and more featureful. Among other
tweaks, we now print a summary of dependencies and build options, and
the documentation is generated with more sensible breadcrumbs and
builds properly with Sphinx 1.3.
REVIEW: 126075
|
|
REVIEW: 126090
|
|
The XINPUT library is unlikely to be available on many systems,
including a lot of Linux distributions. This will warn developers in
advance by (a) not searching for XINPUT unless it was explicitly
requested, and (b) printing a warning if they do request it.
REVIEW: 125935
|
|
Makes sure there isn't old stuff still there, it didn't save much time to
keep the files around anyway.
|
|
|
|
Multiple ecm_create_qm_loader() with different catalog names would
overwrite each other's generated files, causing the wrong catalog to be
loaded at runtime for some targets.
This puts the catalog name into the generated filename. Since the
catalog name is the only difference between the generated files, this is
sufficient to fix the runtime behaviour.
REVIEW: 125999
|
|
This is based on commit 6745bd7e4796560959bb67e33b7c7f86f96a5a94 (and
the subsequent fix-up commits).
|
|
This broke the build for projects which used ecm_create_qm_loader in
unusual ways. A better approach is coming, but won't be in e-c-m 5.16.
This reverts commit 009c480413910e8c1a18f4d1420f4a517ea606e6.
CCBUG: 346188
CCMAIL: release-team@kde.org
CCMAIL: kde-buildsystem@kde.org
|
|
This commit is dependent on 009c480413910e8c1a18f4d1420f4a517ea606e6,
which is the primary commit to be reverted.
This reverts commit 634a0a2d3d7ba1bec2bae846acf0faf6184f4c71.
|
|
This commit is dependent on 009c480413910e8c1a18f4d1420f4a517ea606e6,
which is the primary commit to be reverted.
This reverts commit 0496f8ae020c497b5f65234063150781d023f8ba.
|
|
This commit is dependent on 009c480413910e8c1a18f4d1420f4a517ea606e6,
which is the primary commit to be reverted.
This reverts commit 39484722101730d4f1a4bccbc5467c0eb2cc0f6f.
|
|
The V1 syntax of ecm_install_icons searched for icons by globbing files
with a particular naming pattern. If there were no such icons, this used
to do nothing, but silently. Commit fb7b8eea7d accidentally made this an
error. More sensible would be to make it a warning.
BUG: 354610
REVIEW: 125931
|
|
CCMAIL: kde-licensing@kde.org
CCMAIL: agateau@kde.org
|
|
LANGUAGE has higher priority than LC_ALL.
|
|
This is easier to distinguish from "english" in the test output than
"british english".
|
|
|
