diff options
author | Brad King <brad.king@kitware.com> | 2014-11-07 15:20:58 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-11-07 15:20:58 (GMT) |
commit | b71399a189616b762e975670e477c6d09813803f (patch) | |
tree | f26a6965dddf3d02d033ef84c6d88e009d0b91e7 /Modules/FindQt4.cmake | |
parent | 51bb383dbf6de9f46d7784a0d3e0bc845a85a0a3 (diff) | |
parent | 79349ed8fc22f70de7f839b2323cf3e93aca9bc9 (diff) | |
download | CMake-b71399a189616b762e975670e477c6d09813803f.zip CMake-b71399a189616b762e975670e477c6d09813803f.tar.gz CMake-b71399a189616b762e975670e477c6d09813803f.tar.bz2 |
Merge branch 'release-doc-formatting' into release
Diffstat (limited to 'Modules/FindQt4.cmake')
-rw-r--r-- | Modules/FindQt4.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 2c39de5..c715c81 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -104,9 +104,11 @@ # macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... ) # Create the interface header and implementation files # for all listed interface xml files. -# The basename will be automatically determined from the name of the xml file. +# The basename will be automatically determined from the name +# of the xml file. # -# The source file properties described for QT4_ADD_DBUS_INTERFACE also apply here. +# The source file properties described for +# QT4_ADD_DBUS_INTERFACE also apply here. # # # :: @@ -172,7 +174,7 @@ # a class uses the Q_OBJECT macro, moc has to run on it. If you don't # want to use QT4_WRAP_CPP() (which is reliable and mature), you can insert # #include "foo.moc" -# in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will the +# in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will # scan all listed files at cmake-time for such included moc files and if it # finds them cause a rule to be generated to run moc at build time on the # accompanying header file foo.h. @@ -188,8 +190,8 @@ # This function is obsolete. Use target_link_libraries with IMPORTED targets # instead. # Make <target> use the <modules> from Qt. Using a Qt module means -# to link to the library, add the relevant include directories for the module, -# and add the relevant compiler defines for using the module. +# to link to the library, add the relevant include directories for the +# module, and add the relevant compiler defines for using the module. # Modules are roughly equivalent to components of Qt4, so usage would be # something like: # qt4_use_modules(myexe Core Gui Declarative) |