bin/gbuild-to-ide | 9 +++++----
qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit fd55c09ebab3827847d69112a8786a3413d42db2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 15 12:07:49 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 15 15:47:17 2019 +0200
cid#1448277 RV: Bad use of return value
Change-Id: I68fdfc59de2d2590730abaae8b16bfe92e1693b2
Reviewed-on: https://gerrit.libreoffice.org/75629
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
index 0207c3c77a9e..957901775e51 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
@@ -150,7 +150,7 @@ public class _XContentProviderManager extends
MultiMethodTest {
log.println("registering the second provider in non-replacing mode");
try {
oObj.registerContentProvider(contentProvider, myScheme, false);
- Status.failed("registerContentProvider(.., .., false)");
+ throw new
StatusException(Status.failed("registerContentProvider(.., .., false)"));
} catch (DuplicateProviderException e) {
log.println("DuplicateProviderException thrown - OK");
}
commit de44936e61dbd0a0b1d397717f58319f7c0075d5
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jul 15 13:01:15 2019 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Jul 15 15:47:09 2019 +0200
qtcreator: Recursively include module's header files
Recursivley walk the include directories located
inside the current module's directory, since includes
are basically paths relative to the include directories
and can refer to files in subdirectories of the include
path, like e.g.
#include <extended/AccessibleBrowseBoxBase.hxx>
in 'accessibility/source/extended/AccessibleBrowseBoxBase.cxx'.
This way, such header files are added to the .pro files
and are thus e.g. shown in Qt Creator's project view
and can be found by using 'a <FILEANME>' in the Locator.
Change-Id: Id74f971b2ffee82203f74a4d444c41166c671920
Reviewed-on: https://gerrit.libreoffice.org/75628
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index bcb3ec41ba4a..f08c0fcbc2ce 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1694,10 +1694,11 @@ class
QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
# List headers files from current lib
for hdir in lib.include:
if hdir.startswith(lib.location):
- for hf in os.listdir(hdir):
- if hf.endswith(('.h', '.hxx', '.hpp', '.hrc')):
- hf_lopath = lopath(os.path.join(hdir, hf))
- headers_list.append(hf_lopath)
+ for dirpath, _, files in os.walk(hdir):
+ for hf in files:
+ if hf.endswith(('.h', '.hxx', '.hpp', '.hrc')):
+ hf_lopath = lopath(os.path.join(dirpath, hf))
+ headers_list.append(hf_lopath)
# List defines
for key, value in lib.defs.items():
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
