summaryrefslogtreecommitdiffstats
path: root/Tests/QtAutogen
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-autouic-regression'Brad King2015-01-122-0/+9
|\ | | | | | | | | | | 9a673737 QtAutoUic: Add a test for the regression in the parent commit. 7c585699 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings
| * QtAutoUic: Add a test for the regression in the parent commit.Stephen Kelly2015-01-122-0/+9
| |
* | QtAutogen: Regenerate qrc files if their input changes (#15074)Stephen Kelly2014-10-245-0/+67
|/ | | | | | | | | | | | | | | | | Get dependencies from the output of ``rcc --list`` if using Qt 5. Otherwise process the file in the same way as the qt4_add_resources macro. This does not work for RCC files which are generated. The cmake_autogen build step is implemented as a PRE_BUILD step of the target currently if possible, rather than a standalone custom target. This is to keep the number of (synthesized) custom targets that appear in the UI low, but in some cases it is necessary to fall back to a full custom target. Fall back to a full custom target for the VS builds if autorcc is used.
* Merge topic 'autogen-fixes'Brad King2014-09-226-0/+139
|\ | | | | | | | | | | e3c97a19 QtAutogen: Process all ui files in a source file (#14981). b8877b1d QtAutogen: Add source files to target when only AUTORCC is used.
| * QtAutogen: Process all ui files in a source file (#14981).Stephen Kelly2014-09-185-0/+127
| | | | | | | | | | Use a vector to store a list of matched ui_ includes, instead of overwriting the previous match.
| * QtAutogen: Add source files to target when only AUTORCC is used.Stephen Kelly2014-09-172-0/+12
| | | | | | | | Add missing entry to if condition.
* | cmTarget: Make the source files depend on the config.Stephen Kelly2014-04-027-1/+99
|/ | | | | | | | | | | | | | | | | Disallow the use of config-specific source files with the Visual Studio and Xcode generators. They don't have any way to represent the condition currently. Use the same common-config API in cmQtAutoGenerators. While it accepts config-specific files, it doesn't have to support multiple configurations yet. Loop over the configs in cmTargetTraceDependencies and cmGlobalGenerator::WriteSummary and consume all source files. Loop over the configs in cmComputeTargetDepends and compute the object library dependencies for each config.
* QtAutogen: Fix use of multiple ui files in a single target.Stephen Kelly2014-03-254-1/+66
| | | | | | Don't store a mapping of the directory to the ui file. The directory will be a unique key, allowing only one ui file to be specified. Use the source file name instead as the mapping key.
* QtAutogen: Use the basename for resource files.Stephen Kelly2014-03-253-1/+8
| | | | | | | | | | The rcc tool generates a cpp file with a symbol called qInitResources or called qInitResources_${name}, if the name is passed. The qInitResources symbol clashes if multiple qrc files are used in one target. Always pass the name to ensure that the symbol is unique. This is also the behavior of the qtx_add_resource macros.
* QtAutogen: Fix AUTOGEN depends on custom command output with VS.Stephen Kelly2014-03-103-3/+24
| | | | | | | | Visual Studio is handled as a special case for autogen depends. However, the special handling works only for target dependencies, not file dependencies output by a custom command. Use a PRE_BUILD step only if all depends are targets.
* QtAutogen: Only add source files to the target if AUTORCC is ON.Stephen Kelly2014-02-052-1/+12
| | | | | | | | | | | | The qtx_add_resources() macro adds the resource file to the output list to maintain file-level dependencies. Having the qrc file in a target sources is a precondition for AUTORCC to function. When processing the source files of a target, only add the generated qrc_<file>.cpp to the target sources if AUTORCC is ON. This avoids pre-porting conflict with the macro. Reported-by: Micha Hergarden
* QtAutogen: Make uic work even when the source is in a subdir.Stephen Kelly2014-02-044-2/+2
| | | | | | Modify the includedUis to store the path to the file which includes the ui file. Reuse that path to generate the output file from the uic process.
* QtAutogen: Short-circut some logic when moc is not available.Stephen Kelly2014-01-284-0/+71
| | | | | This is the case when AUTOMOC is false. This prevents creating rules to moc the files in the absense of moc.
* Qt Tests: Remove commented and unneeded line.Stephen Kelly2014-01-041-1/+0
|
* cmQtAutogen: Allow specifying depends for autogen targets.Stephen Kelly2013-11-254-1/+49
| | | | | Test this by generating files with a custom target, which moc requires to be present when it is run.
* Merge topic 'fix-automoc-compile-definitions'Brad King2013-11-051-1/+4
| | | | | a1b9465 Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)
* Add automatic rcc invocation for Qt.Stephen Kelly2013-10-245-9/+55
| | | | | This replaces the need to invoke qt4_add_resources by allowing adding the source .qrc file directly to the target sources.
* Add automatic uic invocation for Qt.Stephen Kelly2013-10-244-0/+44
| | | | | | | | | | | | The source files are already processed by cmQtAutomoc to look for moc includes, so extend that to also look for ui_ includes and find corresponding .ui files to process. This replaces the need to invoke qt4_wrap_ui(). As the ui files are not likely to be part of the SOURCES of the target, store the options associated with them separately in the cmMakefile for querying during the autogen run.
* Run the main executable created in the autogen tests.Stephen Kelly2013-10-242-6/+5
| | | | | | | | | | Don't try to show the windows, which would require a gui capable test machine, and that's not guaranteed. Automatically link to qtmain.a on Windows to avoid a policy warning. Set policy CMP0020 to NEW by increasing the required version. Don't attempt to run the test when using Windows.
* Rename the QtAutomoc tests to QtAutogen.Stephen Kelly2013-10-2436-0/+1632