diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-29 15:05:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-29 15:05:04 (GMT) |
| commit | bbc82d85e5e721cc705f1d836630c672cd4acf28 (patch) | |
| tree | 1b58fadc451dbda03d439eedc9958e25d5173317 /Tests/Qt4And5Automoc/main_qt5.cpp | |
| parent | fed6c73e1d21adee7e82d61ec1e08c0eaa184a39 (diff) | |
| parent | f7ae1d8ad6d0db2b6656ed77f7de12189badf05c (diff) | |
| download | CMake-bbc82d85e5e721cc705f1d836630c672cd4acf28.zip CMake-bbc82d85e5e721cc705f1d836630c672cd4acf28.tar.gz CMake-bbc82d85e5e721cc705f1d836630c672cd4acf28.tar.bz2 | |
Merge topic 'fix-Qt-autogen'
f7ae1d8a QtAutogen: Short-circut some logic when moc is not available.
4b989d5f QtAutogen: Separate source file processing from AUTOMOC.
c48d877d QtAutogen: Make some methods appropriately file-static.
394e86df QtAutogen: Fix autouic target options in the presence of a config.
964d7f2a QtAutogen: Remove unused variables.
0d934efd QtAutogen: Remove read of SKIP_AUTOUIC target property.
321e348e QtAutogen: Use Qt 4 IMPORTED targets to find executable locations.
e96683b0 Qt4: Use IMPORTED executable names with custom commands.
e6182f5d Qt4: Create IMPORTED executable targets for all Qt executables.
Diffstat (limited to 'Tests/Qt4And5Automoc/main_qt5.cpp')
| -rw-r--r-- | Tests/Qt4And5Automoc/main_qt5.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Tests/Qt4And5Automoc/main_qt5.cpp b/Tests/Qt4And5Automoc/main_qt5.cpp deleted file mode 100644 index 287b261..0000000 --- a/Tests/Qt4And5Automoc/main_qt5.cpp +++ /dev/null @@ -1,4 +0,0 @@ - -#include "main.cpp" - -#include "main_qt5.moc" |