12 Commits

Author SHA1 Message Date
Pierre-Francois Laquerre
9b07c19f92 Fix path quoting in Qt4 macros
Adding VERBATIM to the ADD_CUSTOM_COMMAND calls in the qt4 macros
ensures that paths are properly quoted when passed to the shell.
This fixes issues when building projects that contained paths with
special characters (according to /bin/sh), such as parentheses or
spaces.
2011-12-03 17:51:24 -07:00
Stephen Kelly
648c454454 Add features from KDE for arguments to qdbusxml2cpp. 2011-09-05 21:59:13 +02:00
Clinton Stimpson
ae587e49a6 Speed up creation of parameters file for moc custom command.
Thanks A. Saratow for patch.
2011-03-10 14:45:45 -07:00
Clinton Stimpson
d640d549d5 allow absolute paths for dbus interface. 2010-12-23 09:21:56 -07:00
David Cole
88281035bd Merge topic 'moc-includes-regex'
35b91ac Fix regex for moc includes when looking for frameworks.
2010-11-23 16:11:15 -05:00
Clinton Stimpson
de0485459c Force cmake to run again when qrc dependency scanning needs to happen. 2010-10-15 16:46:39 -06:00
Clinton Stimpson
2756311a9a Make sure moc parameters file goes in binary directory.
Fix bug 11120.  Parameters files previously went into source
directory when qt4_generate_moc() was given relative paths.
Also simplified some logic for absolute paths.
2010-08-24 12:41:14 -06:00
Todd Gamblin
2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04:00
Clinton Stimpson
35b91ac5c0 Fix regex for moc includes when looking for frameworks. 2010-08-02 09:39:02 -06:00
Clinton Stimpson
c94303fcac Revert "Include relative path in generated qrc and uic files. Fixes #10413."
This reverts commit 108090fde96916ba666f035d1e260f036af5b31e.
2010-04-08 16:39:15 -06:00
Clinton Stimpson
108090fde9 Include relative path in generated qrc and uic files. Fixes #10413. 2010-03-17 16:33:03 -06:00
Alexander Neundorf
0f457937f4 Split some logic of FindQt4.cmake into separate files, which are included automatically.
Qt4Macros.cmake: all the "public" macros of FindQt4.cmake
Qt4ConfigDependentSettings.cmake: the code for detecting the
Qt-configuration dependent additional libraries, e.g. when linking statically.

There should be no functional changes in this patch.
The patch reduces the length of FindQt4.cmake from 1700 lines to around 1000
lines, which is still long enough, but this should make the file a easier to
handle (and it is similar to what we do in KDE with FindKDE4Internal.cmake
and KDE4Macros.cmake)

Ok by Clinton.

Alex
2009-11-15 13:02:19 -05:00