Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

CMake
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a9113ae3

Commit a9113ae3 authored 8 years ago by Brad King Committed by Kitware Robot 8 years ago

Downloads
- Plain Diff

Merge topic 'autogen_json_fix'

48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test

parents e9cfe63d 48b56504

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Tests/QtAutogen/CMakeLists.txt 39 additions, 38 deletions

Tests/QtAutogen/CMakeLists.txt
Tests/QtAutogen/mocPlugin/CMakeLists.txt 5 additions, 5 deletions

Tests/QtAutogen/mocPlugin/CMakeLists.txt
Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json 1 addition, 1 deletion

Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json
Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json 1 addition, 1 deletion

Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json

with 46 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment