Merge branch '1.5'
656d927757f6
Actions

Authored by nalvarez on Apr 11 2013, 6:57 PM.

Description

Merge branch '1.5'

Changes:

Properly set a black on white palette
Better test output in test_templateclassgenerator.
Make TestTemplateClassGenerator pass.
Fix codeutils's testgenerationtest.

Details

Committed

nalvarez

Apr 11 2013, 6:57 PM

Parents

R32:2f3896b35046: Fix codeutils's testgenerationtest.
R32:ab6319a2e96b: Rename some .desktop.cmake back to .desktop.

Branches

Unknown

Tags

Unknown

nalvarez committed R32:656d927757f6: Merge branch '1.5' (authored by nalvarez).Apr 11 2013, 6:57 PM

Merged Changes

Commit	Author	Details	Committed
2f3896b35046	nalvarez	Fix codeutils's testgenerationtest.	Apr 11 2013
c74c67b93175	Script Kiddy	SVN_SILENT made messages (.desktop file)	Apr 7 2013
700449924c76	nalvarez	Make TestTemplateClassGenerator pass.	Apr 7 2013
1129cf03b35f	kfunk/nalvarez	Better test output in test_templateclassgenerator.	Apr 7 2013
d568441f08be	apol	Properly set a black on white palette	Apr 4 2013
d75af4d2d14f	Script Kiddy	SVN_SILENT made messages (.desktop file)	Apr 2 2013
1b2c611ab2d4	Script Kiddy	SVN_SILENT made messages (.desktop file)	Apr 1 2013

Changes (24)

		Path
M		language/codegen/tests/expected/classname.cpp
M		plugins/codeutils/tests/CMakeLists.txt
M		plugins/codeutils/tests/codeutils_tests_config.h.cmake
A	(dir)	plugins/codeutils/tests/data/
A	(dir)	plugins/codeutils/tests/data/testgenerationtest/
V	(dir)	plugins/codeutils/tests/{data/testgenerationtest/templates/ ← templates}
V		plugins/codeutils/tests/{data/testgenerationtest ← }/templates/CMakeLists.txt
V	(dir)	plugins/codeutils/tests/{data/testgenerationtest/templates/test_qtestlib/ ← templates/test_qtestlib}
V		plugins/codeutils/tests/{data/testgenerationtest ← }/templates/test_qtestlib/class.cpp
V		plugins/codeutils/tests/{data/testgenerationtest ← }/templates/test_qtestlib/class.h
V		plugins/codeutils/tests/{data/testgenerationtest ← }/templates/test_qtestlib/test_qtestlib.desktop
V	(dir)	plugins/codeutils/tests/{data/testgenerationtest/templates/test_yaml/ ← templates/test_yaml}
V		plugins/codeutils/tests/{data/testgenerationtest ← }/templates/test_yaml/class.yaml
V		plugins/codeutils/tests/{data/testgenerationtest ← }/templates/test_yaml/test_yaml.desktop
V	(dir)	plugins/codeutils/tests/{templates/ → data/testgenerationtest/templates}
V		plugins/codeutils/tests/{ → data/testgenerationtest}/templates/CMakeLists.txt
V	(dir)	plugins/codeutils/tests/{templates/test_qtestlib/ → data/testgenerationtest/templates/test_qtestlib}
V		plugins/codeutils/tests/{ → data/testgenerationtest}/templates/test_qtestlib/class.cpp
V		plugins/codeutils/tests/{ → data/testgenerationtest}/templates/test_qtestlib/class.h
V		plugins/codeutils/tests/{ → data/testgenerationtest}/templates/test_qtestlib/test_qtestlib.desktop
V	(dir)	plugins/codeutils/tests/{templates/test_yaml/ → data/testgenerationtest/templates/test_yaml}
V		plugins/codeutils/tests/{ → data/testgenerationtest}/templates/test_yaml/class.yaml
V		plugins/codeutils/tests/{ → data/testgenerationtest}/templates/test_yaml/test_yaml.desktop
M		plugins/codeutils/tests/testgenerationtest.cpp