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
db0e1fd675
ENH: Fix #7784 . Fix link of glib when needed.
2008-10-07 10:35:22 -04:00
33e87980cb
ENH: Fix #7433 . Put list of files in a .pro file and call lupdate on it,
...
instead of putting the list of files on the command line.
2008-09-22 15:00:31 -04:00
ae9f9e6994
BUG: remove debug statements.
2008-09-22 14:00:37 -04:00
139cae931e
ENH: For #7433 , add a bit more documentation and add ability
...
to specify extra flags to lupdate.
2008-09-18 10:56:58 -04:00
87a31b5b7f
ENH: For #7433 , add documentation that directories also can be specified to
...
update the translation files.
2008-08-30 09:39:33 -04:00
5990594331
ENH: Add comments about pre-processor defines and moc.
2008-08-26 16:04:36 -04:00
263a4229e5
ENH: Use COMPILE_DEFINTIONS instead of DEFINITIONS.
2008-08-26 11:50:15 -04:00
607e4eb4b4
ENH: Add -DWIN32 for moc on Windows. Final fix for #7465 .
2008-08-26 11:22:27 -04:00
dbdca3440a
ENH: Add -D preprocessor defines to the moc commands.
...
Needed to fix #7465 .
2008-08-25 19:41:56 -04:00
502841c974
BUG: fix closing IF()
...
Alex
2008-08-17 05:11:51 -04:00
db4bebe5c8
BUG: fix #7447 , FindModulesExecuteAll test fails if both Qt3 and KDE4 can be
...
found in the system
Qt3 and Qt4 cannot be used together in one project.
Now Qt3/KDE3 and Qt4/KDE4 handle the case that this is done nevertheless
properly, i.e. they fail with FATAL_ERROR if it was REQUIRED and they fail
with just MESSAGE(STATUS ...) and RETURN() if it was not REQUIRED
BUG: make FindQt4 error out with FATAL_ERROR also if it was searched QUIET
Alex
2008-08-16 19:11:53 -04:00
65ad7ba830
BUG: Watch for empty qconfig.pri files. Fixes #7287 .
2008-07-05 11:57:57 -04:00
dcdcd00ffa
BUG: Fix for #7118 .
...
Relative paths going outside the current source dir resulted in badly
placed moc source files in the build dir (or out of the build dir).
2008-06-06 01:36:39 -04:00
7676ac8891
ENH: Some Linux distros don't install xorg-devel, png-devel, etc... when
...
qt4-devel is installed. Finding them was required to support building
against static Qt. Changing it so they are ignored if not found.
2008-06-03 10:29:11 -04:00
ec1cf2f621
ENH: Find debug libs from static Qt on Windows.
2008-05-26 11:17:45 -04:00
c3bc99d5a1
ENH: use PATHS keyword
2008-05-23 15:25:26 -04:00
db52ce45fa
ENH: Make Qt not found if the QtCore library can't be found.
...
Also report an error when trying to use MSVC with Qt built by mingw.
2008-05-21 13:36:37 -04:00
f4a299a11f
ENH: Qt/Mac binary install puts QtCLucene library in a different place than the
...
normal Qt frameworks. Let's find it.
2008-05-09 11:50:56 -04:00
30ff492aad
ENH: Allow finding phonon and QtDBus on Mac. Fixes #6950 .
2008-05-03 17:55:05 -04:00
44ce8ea362
BUG: Fix typo reported in #6790 .
2008-04-10 10:01:01 -04:00
7d85462cc3
BUG: Fix problem with last patch when trying to take substr of shorter strings
...
than expected. Fixes #6730 .
2008-04-07 19:43:04 -04:00
fcd09ca90f
BUG: Fix 6726. Create correct moc rule for configured headers in binary dir.
2008-04-07 11:23:02 -04:00
05060801d9
BUG: make sure all paths extracted from qmake are converted to cmake paths because on windows they will have \ instead of / and you can get odd escaping errors
2008-04-02 11:05:51 -04:00
3e572f9bab
STYLE: add documentation for QT4_CREATE_MOC and QT4_AUTOMOC ( #6687 )
...
Alex
2008-04-01 17:59:21 -04:00
e8b85ae12d
ENH: Add QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH variables.
2008-03-27 15:18:35 -04:00
1727e6d932
ENH: fix if
2008-03-24 15:40:52 -04:00
44ad24c13a
BUG: Fix issue when Qt from Linux distro is used
...
and glib and dbus development packages aren't installed.
2008-03-19 16:14:06 -04:00
181c39d58a
BUG: Don't clear output strings before using.
2008-03-19 15:27:09 -04:00
9d7e09f332
STYLE: Improve documentation by expanding on how UseQt4.cmake fits in.
2008-03-18 18:37:28 -04:00
ae16aa9679
STYLE: fix documentation again: QT_LIBRARIES exists if you use Qt4 via UseQt4.cmake
...
Alex
2008-03-18 17:54:40 -04:00
caa6de5b89
STYLE: fix documentation, QT_LIBRARIES doesn't exist, and also didn't exist
...
in cmake 2.4.3, the first stable cmake 2.4.x release
Alex
2008-03-18 17:26:50 -04:00
5eb8133af4
ENH: Satisfy QtDBus dependencies for builds with static Qt.
...
Finish fix for #6607 .
2008-03-18 16:30:14 -04:00
317d1705af
ENH: For Mac OS X, remove QuickTime link for Qt 4.3+ and add AppKit link for Qt 4.2+.
2008-03-17 14:53:02 -04:00
7a888b68da
ENH: Added FindPackageMessage module
...
- Defines FIND_PACKAGE_MESSAGE function to help display
find result messages only once
- Added use of it to FindPackageHandleStandardArgs
- Added use of it to FindQt4, and FindX11
- This cleans up repeated messages in big projects
2008-03-17 11:10:42 -04:00
0f005630d3
BUG: Fix typo to find QAssistantClient header.
2008-03-14 14:28:29 -04:00
f874cd684c
ENH: Satisfy QtNetwork and QtOpenGL dependencies for builds with static Qt.
...
Partial fix for #6607 .
2008-03-14 13:29:16 -04:00
58a2872f2e
ENH: Automatically add dependent modules.
...
For example, if QT_USE_QTXMLPATTERNS is on, QT_USE_QTNETWORK is turned on.
The equivalent happens in a qmake .pro file when QT += xmlpatterns is specified.
2008-03-14 13:16:58 -04:00
f4c319b60b
ENH: Support static Qt 4.4 builds using QtHelp module.
2008-03-14 12:11:01 -04:00
5a112028b7
ENH: Add support for Qt 4.4's phonon module.
...
Add new Qt 4.4 modules in UseQt4.cmake
2008-03-13 19:12:46 -04:00
7634b36364
ENH: Add support for new modules in Qt 4.4. Fixes #6316 .
...
Simplify and clarify some documentation.
BUG: Fix order of include paths (from KDE's FindQt4)
Fix find of Designer components debug library on Windows.
2008-03-13 15:29:28 -04:00
c39a8c39aa
ENH: Allow users to recover from trying to use an improperly installed Qt
...
without removing their cache, fixing their environment and trying again.
2008-03-05 12:53:44 -05:00
f868fe3abd
BUG: Fix error when paths have + in them. (special regex characters)
2008-02-14 01:11:20 -05:00
9439cbd4ba
BUG: Fix FindQt4.cmake QT4_CREATE_MOC_COMMAND macro to work with spaces in the path while using the @ syntax on MSYS builds.
2008-02-13 14:35:10 -05:00
a8c4244916
ENH: Better way to have escaping done correctly for all generators.
2008-02-08 12:01:54 -05:00
e6c9f302f2
BUG: Fix arg for moc parameter file so it works with unix makefiles, when the
...
build dir has a space in it.
2008-02-07 23:26:42 -05:00
593c213f16
BUG: When preserving relative paths for moc generated files,
...
also consider paths to headers in the build directory.
2008-02-01 13:52:04 -05:00
b90d3114c5
ENH: Make lupdate and lrelease executables advanced variables.
2008-01-29 17:01:00 -05:00
bb52f45ebb
ENH: Allow QT4_WRAP_CPP to work with dir1/myobject.h dir2/myobject.h
...
Fixes #5067 .
2008-01-29 13:07:52 -05:00
404db8811e
ENH: Improve find for glib/gthread when Qt is configured to use it.
...
Fixes #6220 .
2008-01-28 19:20:00 -05:00
eba5032389
ENH: Add macros to handle translations. Fixes #6229 .
2008-01-22 10:11:29 -05:00
510f578f8b
ENH: For moc commands on Windows, use @param_file method to allow arguments
...
longer than Windows' command length limitation.
Fixes #6221 .
2008-01-11 12:40:24 -05:00
fffb0bd908
ENH: Better QT4_EXTRACT_OPTIONS macro.
2007-12-19 16:48:04 -05:00
f5f397debd
ENH: should define QT_DLL instead of QT_SHARED
2007-12-18 14:50:18 -05:00
b383d98771
ENH: Improve documentation of new features.
2007-12-18 13:05:43 -05:00
7bcafb410f
STYLE: some whitespace syncing with FindQt4.cmake in KDE svn
...
Alex
2007-12-16 05:49:23 -05:00
0304073ea6
ENH: Add OPTIONS argument to some Qt4 macros.
...
Addresses #6125 .
2007-12-14 16:56:25 -05:00
1d4a87b001
ENH: Correctly find UiTools library on Mac w/ binary install of Qt.
...
Fixes #4554 .
2007-12-11 12:57:54 -05:00
45e974791f
ENH: Fix case of windows library names to support
...
cross compiling w/ Qt on case sensitive platforms.
2007-11-14 18:08:16 -05:00
1a5fe3047e
BUG: handle qmake returning multiple paths for mkspecs. Fixes #5935
2007-11-08 12:27:18 -05:00
46bdfe1d7b
ENH: Add support for static Qt 4.3 builds.
2007-11-08 10:56:13 -05:00
ef3c6f31fd
ENH: set QT_EDITION_DESKTOPLIGHT and do not disable modules
2007-09-27 14:20:27 -04:00
3d648db3c4
ENH: look for qt in a beter registry place and disable modules that won't work with DesktopLight, also set QT_EDITION variable
2007-09-26 20:53:29 -04:00
93223f7dc0
BUG: if Qt is installed as a framework, add -F to the command line so
...
Q_WS_MAC can be detected correctly
Alex
2007-09-19 09:35:37 -04:00
Clinton Stimpson
Alexander Neundorf
Brad King
Bill Hoffman