ffbae660cd
fix logic of _QT4_ADJUST_LIB_VARS() wrt. release- and debug libraries
...
Now the case that both the release- and the debug-version of a library is
handled first, because otherwise we always ran into this branch, since the
debug-only and the release-only branch also set both variables.
Alex
2009-12-23 09:58:34 -05:00
a2c62d402c
sync with KDE: sort the libs alphabetically
...
Alex
2009-12-20 10:34:13 -05:00
4740bf6b3e
-add support for QtMultimedia and some sync with KDE
...
-the QtMultimedia module is new since Qt 4.6.0
-sort the doc entries alphabetically
Alex
2009-12-20 09:06:42 -05:00
eb83c19789
-better support for Qt4 as frameworks
...
before this patch -F<framework> dir had to be added manually in some way
when using Qt4 installed as framework and when using FindQt4.cmake directly,
i.e. without UseQt4.cmake. With this patch the framework dir is
automatically added to QT_INCLUDE_DIR when Qt is installed as a framework.
Ok by Clinton, tested already in KDE by Mike Arthur.
Alex
2009-12-16 17:16:59 -05:00
1d9cb15513
also provide QT_DESIGNER_EXECUTABLE and QT_LINGUIST_EXECUTABLE
...
Alex
2009-11-23 17:53:50 -05:00
f756b73ac5
Don't search for QtMotif on all platforms - only on X11.
2009-11-17 14:44:33 -05:00
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
fb8d583054
also search for "qmake-mac", which is installed by macports ( http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2 )
...
Alex
2009-11-12 12:55:19 -05:00
35a209b0db
Search for the header QtAssistant for QT_QTASSISTANT_INCLUDE_DIR instead of QtAssistantClient
...
This should not change the result (since both should be in the same
directory), but seems a bit more logical and is also in sync with what is done in the KDE version.
Alex
2009-11-10 13:57:21 -05:00
4a2f809124
Sort documentation entries better and move mark_as_advanced() a bit back
...
Alex
2009-11-09 12:55:46 -05:00
054eed5819
-another tiny sync with KDE4, no functional changes
...
Alex
2009-11-08 13:21:09 -05:00
e325b1a38a
some syncing with FindQt4.cmake from KDE, no functional changes
...
-the mark_as_advanced() calls for the variables coming from qmake are now in
the corresponding section, and not in the section where the include dirs are
foudn
Alex
2009-11-08 13:01:46 -05:00
cff3a4420b
Check for openssl-linked option with Qt 4.4+ before making ssl a dependency.
2009-10-07 18:51:39 -04:00
bca63bb738
When getting include dirs for moc, also watch for framework includes and use -F instead of -I.
2009-10-05 11:21:30 -04:00
e364dc784f
some syncing with the FindQt4.cmake from KDE
...
-remove the parentheses in the if() conditions, they don't change the
result, and without them these lines are identical to the ones in
FindQt4.cmake from KDE
-mention which qmake was used for finding Qt
Alex
2009-10-04 11:31:30 -04:00
3563e6f44e
-add the additional features for the dbus macros from KDE's FindQt4.cmake
...
Alex
2009-10-03 12:04:15 -04:00
61a1ec5f20
document how the minimum version can be specified
...
Alex
2009-10-01 16:48:19 -04:00
86459a89a1
Add documentation for Cocoa flag and move Motif under X11 flag.
2009-10-01 16:41:00 -04:00
c4bb9c9d42
Convert CMake find-modules to BSD License
...
This adds copyright/license notification blocks CMake's find-modules.
Many of the modules had no notices at all. Some had notices referring
to the BSD license already. This commit normalizes existing notices and
adds missing notices.
2009-09-28 11:45:50 -04:00
36606b6d73
add support for finding qcollectiongenerator executable. fixes #9248 .
2009-09-22 18:44:24 -04:00
3551bc31f1
Add support for Qt configured with custom qtlibinfix (see issue 9571). Also fix CMP 15 warnings.
2009-09-22 16:28:13 -04:00
ad5a455bb5
Fix issue 9581. Qt 4.5+ needs gobject-2.0.
2009-09-21 23:07:44 -04:00
d6e8ffa927
use -o flag instead of > for qdbuscpp2xml
2009-09-01 15:21:06 -04:00
e13176e92b
BUG: fix relative paths from different drives on Windows
2009-07-16 18:53:20 -04:00
c171d57ed0
ENH: Better error message for those who switch from Qt3 to Qt4 and don't clean their cache file.
2009-05-19 11:38:18 -04:00
22f1c78677
BUG: Fix spaces in file paths for lupdate command
2009-05-06 11:21:22 -04:00
2d22e11a4a
ENH: Add support for QtScriptTools in Qt 4.5.
2009-05-06 09:44:36 -04:00
f4f5da869c
ENH: Add support for QtScriptTools in Qt 4.5.
2009-05-06 09:42:01 -04:00
ff561cd1d3
ENH: Do a recheck of QT_MAC_USE_COCOA when qmake executable changes.
2009-03-26 11:04:18 -04:00
6a6ade8de2
ENH: Support OUTPUT_LOCATION property for qm files.
...
Fixes #8492 .
2009-03-25 15:29:46 -04:00
55a6042d9c
BUG: Need to fix find of qtmain library when qmake executable is changed.
2009-03-19 15:44:54 -04:00
bc8f2f50a8
ENH: add patch from Debian, which adds support lrelease-qt4 and lupdate-qt4
...
http://patch-tracking.debian.net/patch/series/view/cmake/2.6.3-1/FindQt4_qt4_lupdate_lrelease.diff
Alex
2009-02-25 16:29:29 -05:00
08ca8f5053
ENH: Support COMPONENTS argument to find_package().
...
See bug #8542 .
2009-02-19 16:04:57 -05:00
abdcf91422
ENH: Support version argument in find_package().
...
See bug #8542 .
2009-02-19 15:51:43 -05:00
2b4a472e81
ENH: Allowing finding a relocated Qt installation which contains a qt.conf to override the hardcoded paths in qmake.
...
Fixes #8532 .
2009-02-13 18:52:02 -05:00
54e258414d
ENH: Change FILEPATH to STRING for a list of libraries.
2009-02-10 18:13:24 -05:00
dda19cd36f
ENH: Support .hpp with automoc.
2009-02-09 16:42:19 -05:00
f26c235aba
BUG: When detecting if qmake executable is changed, don't error if path
...
contains regex chars.
2009-02-07 12:23:02 -05:00
56ade2af43
ENH: Add support for building with Qt's ActiveX support on Windows.
2009-02-05 23:01:38 -05:00
f9710e22ec
ENH: Also find .moc files if there are spaces between # and include.
...
Fixes #8433 .
2009-01-29 13:26:01 -05:00
aad46d7989
BUG: Fixed recent regression when finding some includes.
2009-01-26 10:12:37 -05:00
b2d52b07ad
ENH: Add convenience for identifying Cocoa based Qt.
2009-01-23 16:52:15 -05:00
515ce9315d
BUG: Fix for #8247 .
...
Add QT_TRANSLATIONS_DIR pointing to the Qt translation files, and docs for it.
Also add docs for QT_BINARY_DIR.
2008-12-15 18:48:48 -05:00
25eeb3c47c
BUG: Revert 1.138.
2008-11-25 16:56:44 -05:00
e8e4160cce
BUG: Fix #7969 . Fix moc output files if source dir contains regex characters.
2008-11-05 17:56:55 -05:00
66db462bbe
BUG: Fix find of assistant on Mac.
2008-10-24 17:48:35 -04:00
f33943036e
BUG: Fix regression in finding QtAssistant
2008-10-20 13:31:50 -04:00
b82eb2b9b3
ENH: better way to find uic and moc.
2008-10-15 18:05:07 -04:00
9b2744f6fe
ENH: When changing the qmake pointed to, re-find all of Qt's includes, libraries, etc...
...
This makes it much easier to switch between Qt versions.
2008-10-13 22:12:54 -04:00
ca8c4ea4a6
BUG: Fix find of dbus dependency in Qt 4.4
2008-10-13 19:39:47 -04:00
Alexander Neundorf
Clinton Stimpson
Brad King