4f3436dd11
Merge topic 'fix-Qt-casing'
...
3252149
2012-08-30 11:55:36 -04:00
325214900b
Fix casing of 'Qt' in docs, comments and user-visible strings.
...
QT (cue-tea) is Apple QuickTime.
Qt (cute) is the C++ framework.
2012-08-28 11:24:55 +02:00
caa9151169
Fix errors detecting Qt4 on Windows 8.
...
Thanks to Petr Baloun for the patch.
2012-08-24 09:54:31 -06:00
32710211ad
Merge topic 'qt4_use_modules'
...
1420691
2012-08-20 15:42:43 -04:00
1420691b35
Add new qt4_use_modules function.
2012-08-19 23:45:09 +02:00
35c6ae8877
FindQt4: Give precedence to QTDIR environment variable, if set.
...
Remove old search paths that aren't needed.
Keep using PATHS instead of HINTS because a Windows machine may have
a different Qt in its PATH and putting QTDIR and the registry entry
ahead of PATH could cause apps to fail when run.
2012-08-16 07:31:17 -06:00
5a6a3d4342
FindQt4: Give precedence to QTDIR environment variable, if set.
2012-08-15 18:20:16 -06:00
4a772a1686
Fix regex for qt minor version.
...
Thanks to Dubrovskiy Viacheslav and Sergei Epifanov for patch.
2012-08-15 18:14:40 -06:00
9db3116226
Remove CMake-language block-end command arguments
...
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block. This is no longer the preferred style.
Run the following shell code:
for c in else endif endforeach endfunction endmacro endwhile; do
echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
77543bde41
Convert CMake-language commands to lower case
...
Ancient CMake versions required upper-case commands. Later command
names became case-insensitive. Now the preferred style is lower-case.
Run the following shell code:
cmake --help-command-list |
grep -v "cmake version" |
while read c; do
echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
7bbaa4283d
Remove trailing whitespace from most CMake and C/C++ code
...
Our Git commit hooks disallow modification or addition of lines with
trailing whitespace. Wipe out all remnants of trailing whitespace
everywhere except third-party code.
Run the following shell code:
git ls-files -z -- \
bootstrap doxygen.config '*.readme' \
'*.c' '*.cmake' '*.cpp' '*.cxx' \
'*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
'*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
egrep -z -v '^(Modules/CPack\..*\.in)' |
xargs -0 sed -i 's/ \+$//'
2012-08-13 14:18:39 -04:00
6c8722fab5
Fix typo direcotry -> directory (and similar) [ #13444 ]
2012-07-30 08:08:33 +02:00
aa841ae3f3
FindQt4: extend documentation
...
-refer to AUTOMOC from QT4_AUTOMOC
-mention how source file properties influence QT4_ADD_DBUS_INTERFACE
2012-06-20 18:31:37 +02:00
b0a8bc364d
Merge topic 'qt4-phonon-backend'
...
ad7c80c
2012-06-05 14:20:47 -04:00
ad7c80cd9f
Added conditional for the phonon backend plugin.
...
If on APPLE, the phonon backend plugin is set to phonon_qt7. If on WIN32, the phonon backend plugin is set to phonon_ds9. I did not add any for generic UNIXes as they could have a whole host of things. A more comprehensive script would actually attempt to detect which phonon plugins were installed. However, this is a simple fix for now that will work for most people.
2012-05-29 14:56:07 -06:00
37a28ffa36
Fix the number variable comparison when Qt is not found.
2012-05-03 17:40:04 +02:00
1dfe15c431
Abort FindQt4.cmake if Qt 5 is found.
2012-05-03 16:47:07 +02:00
cbdfcc6515
FindQt4: clarify warning message about incorrect Qt installation.
...
Fixes bug #12915 .
Thanks Laurent Rineau and Brad King for input.
2012-02-08 18:40:55 -07:00
cf4b52980d
Add QT_LIBRARIES_PLUGINS variable to UseQt4.
2011-10-03 11:01:39 -06:00
a67be31784
qt4: also find QtUiTools when cross compiling with mingw.
2011-08-29 08:23:44 -06:00
de30173d5b
Remove C compiler requirement from FindQt4.cmake
...
Use the new check_cxx_symbol_exists instead of check_symbol_exists.
Also remove a debug message from CheckSymbolExists.cmake.
2011-07-28 12:15:46 -06:00
df7a95629c
Merge topic 'qt4-apple-framework-fix'
...
702538e
2011-07-26 14:57:48 -04:00
702538eaa3
Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X
2011-07-25 12:30:30 -06:00
0ae8a3405b
Add qt4/QtCore to help find Qt headers when cross-compiling.
2011-07-22 13:38:36 -06:00
e7f05d9759
Add imported targets support for frameworks on Mac.
2011-06-13 17:21:41 -06:00
46f64bd9e7
When cross compiling, don't double-root paths when using find_*.
2011-03-10 14:17:13 -07:00
6b9bc54566
Fix regression in 43cb9b8.
...
Put back some code for setting the QT_VERSION_* variables that wasn't supposed to be removed.
2011-02-23 17:13:49 -07:00
62f816adde
Merge topic 'qt4-fphsa'
...
7a1027a4c1c35843cb9b8
2011-02-22 14:36:33 -05:00
4167be052f
Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.
2011-02-19 15:30:02 -07:00
7a1027a1b6
When checking find_package() components, special case qtmain.
...
Its just a library on Windows only.
Fixes bug #11791 .
2011-02-04 09:01:55 -05:00
4c1c358332
FindQt4: Include builtin FindPackageHandleStandardArgs directly
...
Apply to FindQt4 change from commit b0118402
2011-01-20 11:46:32 -05:00
858fe0ed41
Replace exec_program with execute_process for qmake queries.
2011-01-17 19:14:22 -07:00
43cb9b8276
Change to use fphsa to check required variables and version.
...
Also, set the required variables based on components, if specified.
Also, don't make finding uic required if not using QtGui.
2011-01-14 21:26:19 -07:00
e6bb8c7a6e
Add support for using static/dynamic Qt plugins.
2011-01-01 11:45:05 -07:00
cfba5ef111
Fix regression in 2dae2f1 which added find of Qt imports dir.
2010-10-15 16:36:14 -06:00
2dae2f1a0b
Find imports dir in Qt 4.7
2010-10-08 20:55:55 -06:00
c86d677fe0
Merge topic 'findqt4-cross-compile'
...
25931ae
2010-09-28 14:03:37 -04:00
25931ae10e
Fix regression in cross-compile patches with finding Qt libs.
...
If a Qt installation is in CMAKE_PREFIX_PATH and a
QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation,
prefer finding libs in the latter Qt installation.
2010-09-23 16:50:09 -06:00
2cde67a781
Modules: Fix spelling 'To distributed' -> 'To distribute'
2010-08-09 08:48:31 -04:00
c0194278ac
Fix mingw/VS warning message with cross compile re-org.
2010-07-15 10:23:32 -06:00
7fd3739ce7
Find correct Qt plugins for cross-compiling.
2010-07-06 14:37:16 -06:00
ff888dd648
Fix some issues with refinding when qmake executable is changed.
2010-07-06 13:24:53 -06:00
22e725fb88
Tweak for cygwin, don't convert : to ;
2010-07-03 08:58:25 -06:00
b55da4c688
Add cross-compiling support to FindQt4.cmake
2010-07-02 15:47:07 -06:00
1f608718fc
Remove macro for querying qmake for qmake variables.
...
Remove last place for querying qmake values.
Also removed internal macro to support querying qmake.
Depends on findthreads-irix topic.
2010-06-12 13:00:08 -06:00
61ad5242b7
Change to use FindX11.cmake. Should fix #9929 .
2010-03-17 10:48:05 -06:00
bd0b37ea3d
ENH: Clarify a doc string. Fixes #10358 .
2010-03-17 07:43:22 -06:00
70290e1f64
Add support for QtDeclartive module.
2010-02-17 19:12:18 -05:00
03769801ff
-make the imported targets feature of FindQt4.cmake fully backwards compatible
...
After discussing with Brad and Clinton:
-the namespace for the imported targets is now "Qt4::", tested with Makefiles, Visual Studio and XCode projects
-the imported targets are always created
-if QT_USE_IMPORTED_TARGETS is set to TRUE (it defaults to FALSE), the QT_QTFOO_LIBRARY variables are set to point to these imported
targets, otherwise the old behaviour is used.
-on OSX if Qt has been found as framework, disable QT_USE_IMPORTED_TARGETS, since cmake doesn't handle the framework directory as location of the library correctly
Alex
2010-01-18 16:23:21 -05:00
1833961ce5
some tweaks as suggested by Brad (no functional changes)
...
-set the type of the IMPORTED libraries to UNKNOWN, this way also on Windows
only the "LOCATION" property has to be set
-the if() around the SET(QT_${basename}_FOUND 1) was useless (always true)
-the mapping of the configuration types DEBUG and PROFILE did not belong here
Alex
2010-01-18 13:38:38 -05:00
Brad King
Stephen Kelly
Clinton Stimpson
David Cole
Kitware Robot
Rolf Eike Beer
Kurtis Nusbaum
David Faure
Mike McQuaid
Markus Rathgeb
Todd Gamblin
Alexander Neundorf