lp:amarok

Created by Philip Muškovac on 2011-03-01 and last modified on 2020-03-31
Get this branch:
bzr branch lp:amarok

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
Amarok
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/amarok.

The next import is scheduled to run in 3 hours.

Last successful import was 1 hour ago.

Import started 2 hours ago on izar and finished 1 hour ago taking 30 seconds — see the log
Import started 8 hours ago on alnitak and finished 8 hours ago taking 30 seconds — see the log
Import started 14 hours ago on alnitak and finished 14 hours ago taking 30 seconds — see the log
Import started 20 hours ago on alnitak and finished 20 hours ago taking 30 seconds — see the log
Import started on 2020-03-30 on izar and finished on 2020-03-30 taking 30 seconds — see the log
Import started on 2020-03-30 on alnitak and finished on 2020-03-30 taking 40 seconds — see the log
Import started on 2020-03-30 on izar and finished on 2020-03-30 taking 3 minutes — see the log
Import started on 2020-03-30 on alnitak and finished on 2020-03-30 taking 40 seconds — see the log
Import started on 2020-03-29 on izar and finished on 2020-03-29 taking 30 seconds — see the log
Import started on 2020-03-29 on alnitak and finished on 2020-03-29 taking 30 seconds — see the log

Recent revisions

32291. By l10n daemon script <email address hidden> 19 hours ago

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"

32290. By l10n daemon script <email address hidden> on 2020-03-30

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"

32289. By Pino Toscano on 2020-03-28

Fix dangling string pointers

the const char* buffer of a temporary QByteArray object will be a
dangling pointer once the QByteArray goes out of scope; hence store the
string as QByteArray and pass its buffer where needed instead

32288. By Pino Toscano on 2020-03-28

Revert "tests: start porting to MOCK_METHOD"

MOCK_METHOD was added in gmock 1.10.0, which is too new...

This reverts commit 5105cc76fd9bba21801440bb3c44060dd2fbe545.

32287. By Pino Toscano on 2020-03-28

tests: start porting to MOCK_METHOD

port the majority of the gmock MOCK_* macros to MOCK_METHOD: this way,
other than using the documented way, it is possible to properly specify
override markers

32286. By Pino Toscano on 2020-03-28

build: fix gmock include path

the gmock documentation describes <gmock/gmock.h> as the canonical way
to use it, so make sure that the include path is right for that

32285. By Pino Toscano on 2020-03-28

Revert "Fix gmock.h includes"

We will need to fix the include path to the gmock includes instead.

This reverts commit 92c47d411c7d0fb81da01301fe6a7bdd3c18d66b.

32284. By Pino Toscano on 2020-03-28

Fix gmock.h includes

Since the cmake module for google-mock looks for gmock.h and gets the
include path for it, then include it directly as <gmock.h>, instead of
<gmock/gmock.h> (which assumes the parent directory is in the include
paths).

32283. By Pino Toscano on 2020-03-28

Add more override markers

32282. By Pino Toscano on 2020-03-28

build: remove extra CMakeLists.txt

there is no need to install the cmake modules, so remove the unused
CMakeLists.txt files to do that

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.