diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 15:26:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 15:26:02 +0100 |
| commit | c8046f7d42b565e7fc02aa6228c72eee5ab51605 (patch) | |
| tree | eee9ea01acd97d156a9c3466251d3023feef9d82 /config.tests | |
| parent | ae56140b50bccde9e6cfdc6757f345c989ccd755 (diff) | |
| parent | ffac6ee2673a573a9db4f75a89c4c53251fa1304 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0b021b369725b73f09faa14b9da9e2431dc24fad
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/mtdev/mtdev.cpp (renamed from config.tests/unix/mtdev/mtdev.c) | 0 | ||||
| -rw-r--r-- | config.tests/unix/mtdev/mtdev.pro | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/mtdev/mtdev.c b/config.tests/unix/mtdev/mtdev.cpp index f2e38145d8..f2e38145d8 100644 --- a/config.tests/unix/mtdev/mtdev.c +++ b/config.tests/unix/mtdev/mtdev.cpp diff --git a/config.tests/unix/mtdev/mtdev.pro b/config.tests/unix/mtdev/mtdev.pro index 4555bf416c..4c7f76c89f 100644 --- a/config.tests/unix/mtdev/mtdev.pro +++ b/config.tests/unix/mtdev/mtdev.pro @@ -1,4 +1,4 @@ -SOURCES = mtdev.c +SOURCES = mtdev.cpp CONFIG += link_pkgconfig PKGCONFIG_PRIVATE += mtdev |