Commit Graph

299 Commits

Author SHA1 Message Date
Clinton Stimpson dda19cd36f ENH: Support .hpp with automoc. 2009-02-09 16:42:19 -05:00
Clinton Stimpson 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
Clinton Stimpson 56ade2af43 ENH: Add support for building with Qt's ActiveX support on Windows. 2009-02-05 23:01:38 -05:00
Clinton Stimpson f9710e22ec ENH: Also find .moc files if there are spaces between # and include.
Fixes #8433.
2009-01-29 13:26:01 -05:00
Clinton Stimpson aad46d7989 BUG: Fixed recent regression when finding some includes. 2009-01-26 10:12:37 -05:00
Clinton Stimpson b2d52b07ad ENH: Add convenience for identifying Cocoa based Qt. 2009-01-23 16:52:15 -05:00
Clinton Stimpson 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
Clinton Stimpson 25eeb3c47c BUG: Revert 1.138. 2008-11-25 16:56:44 -05:00
Clinton Stimpson e8e4160cce BUG: Fix #7969. Fix moc output files if source dir contains regex characters. 2008-11-05 17:56:55 -05:00
Clinton Stimpson 66db462bbe BUG: Fix find of assistant on Mac. 2008-10-24 17:48:35 -04:00
Clinton Stimpson f33943036e BUG: Fix regression in finding QtAssistant 2008-10-20 13:31:50 -04:00
Clinton Stimpson b82eb2b9b3 ENH: better way to find uic and moc. 2008-10-15 18:05:07 -04:00
Clinton Stimpson 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
Clinton Stimpson ca8c4ea4a6 BUG: Fix find of dbus dependency in Qt 4.4 2008-10-13 19:39:47 -04:00
Clinton Stimpson db0e1fd675 ENH: Fix #7784. Fix link of glib when needed. 2008-10-07 10:35:22 -04:00
Clinton Stimpson 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
Clinton Stimpson ae9f9e6994 BUG: remove debug statements. 2008-09-22 14:00:37 -04:00
Clinton Stimpson 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
Clinton Stimpson 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
Clinton Stimpson 5990594331 ENH: Add comments about pre-processor defines and moc. 2008-08-26 16:04:36 -04:00
Clinton Stimpson 263a4229e5 ENH: Use COMPILE_DEFINTIONS instead of DEFINITIONS. 2008-08-26 11:50:15 -04:00
Clinton Stimpson 607e4eb4b4 ENH: Add -DWIN32 for moc on Windows. Final fix for #7465. 2008-08-26 11:22:27 -04:00
Clinton Stimpson dbdca3440a ENH: Add -D preprocessor defines to the moc commands.
Needed to fix #7465.
2008-08-25 19:41:56 -04:00
Alexander Neundorf 502841c974 BUG: fix closing IF()
Alex
2008-08-17 05:11:51 -04:00
Alexander Neundorf 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
Clinton Stimpson 65ad7ba830 BUG: Watch for empty qconfig.pri files. Fixes #7287. 2008-07-05 11:57:57 -04:00
Clinton Stimpson 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
Clinton Stimpson 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
Clinton Stimpson ec1cf2f621 ENH: Find debug libs from static Qt on Windows. 2008-05-26 11:17:45 -04:00
Bill Hoffman c3bc99d5a1 ENH: use PATHS keyword 2008-05-23 15:25:26 -04:00
Clinton Stimpson 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
Clinton Stimpson 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
Clinton Stimpson 30ff492aad ENH: Allow finding phonon and QtDBus on Mac. Fixes #6950. 2008-05-03 17:55:05 -04:00
Clinton Stimpson 44ce8ea362 BUG: Fix typo reported in #6790. 2008-04-10 10:01:01 -04:00
Clinton Stimpson 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
Clinton Stimpson fcd09ca90f BUG: Fix 6726. Create correct moc rule for configured headers in binary dir. 2008-04-07 11:23:02 -04:00
Bill Hoffman 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
Alexander Neundorf 3e572f9bab STYLE: add documentation for QT4_CREATE_MOC and QT4_AUTOMOC (#6687)
Alex
2008-04-01 17:59:21 -04:00
Clinton Stimpson e8b85ae12d ENH: Add QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH variables. 2008-03-27 15:18:35 -04:00
Bill Hoffman 1727e6d932 ENH: fix if 2008-03-24 15:40:52 -04:00
Clinton Stimpson 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
Clinton Stimpson 181c39d58a BUG: Don't clear output strings before using. 2008-03-19 15:27:09 -04:00
Clinton Stimpson 9d7e09f332 STYLE: Improve documentation by expanding on how UseQt4.cmake fits in. 2008-03-18 18:37:28 -04:00
Alexander Neundorf ae16aa9679 STYLE: fix documentation again: QT_LIBRARIES exists if you use Qt4 via UseQt4.cmake
Alex
2008-03-18 17:54:40 -04:00
Alexander Neundorf 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
Clinton Stimpson 5eb8133af4 ENH: Satisfy QtDBus dependencies for builds with static Qt.
Finish fix for #6607.
2008-03-18 16:30:14 -04:00
Clinton Stimpson 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
Brad King 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
Clinton Stimpson 0f005630d3 BUG: Fix typo to find QAssistantClient header. 2008-03-14 14:28:29 -04:00
Clinton Stimpson f874cd684c ENH: Satisfy QtNetwork and QtOpenGL dependencies for builds with static Qt.
Partial fix for #6607.
2008-03-14 13:29:16 -04:00
Clinton Stimpson 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
Clinton Stimpson f4c319b60b ENH: Support static Qt 4.4 builds using QtHelp module. 2008-03-14 12:11:01 -04:00
Clinton Stimpson 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
Clinton Stimpson 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
Clinton Stimpson 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
Clinton Stimpson f868fe3abd BUG: Fix error when paths have + in them. (special regex characters) 2008-02-14 01:11:20 -05:00
Brad King 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
Clinton Stimpson a8c4244916 ENH: Better way to have escaping done correctly for all generators. 2008-02-08 12:01:54 -05:00
Clinton Stimpson 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
Clinton Stimpson 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
Clinton Stimpson b90d3114c5 ENH: Make lupdate and lrelease executables advanced variables. 2008-01-29 17:01:00 -05:00
Clinton Stimpson 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
Clinton Stimpson 404db8811e ENH: Improve find for glib/gthread when Qt is configured to use it.
Fixes #6220.
2008-01-28 19:20:00 -05:00
Clinton Stimpson eba5032389 ENH: Add macros to handle translations. Fixes #6229. 2008-01-22 10:11:29 -05:00
Clinton Stimpson 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
Clinton Stimpson fffb0bd908 ENH: Better QT4_EXTRACT_OPTIONS macro. 2007-12-19 16:48:04 -05:00
Clinton Stimpson f5f397debd ENH: should define QT_DLL instead of QT_SHARED 2007-12-18 14:50:18 -05:00
Clinton Stimpson b383d98771 ENH: Improve documentation of new features. 2007-12-18 13:05:43 -05:00
Alexander Neundorf 7bcafb410f STYLE: some whitespace syncing with FindQt4.cmake in KDE svn
Alex
2007-12-16 05:49:23 -05:00
Clinton Stimpson 0304073ea6 ENH: Add OPTIONS argument to some Qt4 macros.
Addresses #6125.
2007-12-14 16:56:25 -05:00
Clinton Stimpson 1d4a87b001 ENH: Correctly find UiTools library on Mac w/ binary install of Qt.
Fixes #4554.
2007-12-11 12:57:54 -05:00
Clinton Stimpson 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
Clinton Stimpson 1a5fe3047e BUG: handle qmake returning multiple paths for mkspecs. Fixes #5935 2007-11-08 12:27:18 -05:00
Clinton Stimpson 46bdfe1d7b ENH: Add support for static Qt 4.3 builds. 2007-11-08 10:56:13 -05:00
Bill Hoffman ef3c6f31fd ENH: set QT_EDITION_DESKTOPLIGHT and do not disable modules 2007-09-27 14:20:27 -04:00
Bill Hoffman 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
Alexander Neundorf 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
Alexander Neundorf b0b34dc7e5 ENH: support QtScript (since Qt 4.3), #4632
Alex
2007-08-21 16:50:49 -04:00
Alexander Neundorf dddc9e3103 ENH: patch from #5054: also search for QtUitoolsd lib
Alex
2007-06-08 09:28:33 -04:00
Brad King eb04778766 BUG: Fix bug introduced by revision 1.67. The qmake query mode prints information to stderr on some platforms. The OUTPUT_VARIABLE and ERROR_VARIABLE must be the same variable to get all the output. 2007-03-01 16:44:32 -05:00
Bill Hoffman 533bd43d0f BUG: fix for bug # 3954 glib with qt 2007-02-20 16:35:45 -05:00
Bill Hoffman 531f110323 BUG: fix for bug 4187 fix typo in docs 2007-02-20 15:15:55 -05:00
Bill Hoffman 71e0fcb806 BUG: fix for bug 4464 handle qmake errors better 2007-02-19 13:44:30 -05:00
Bill Hoffman 8b567083da BUG: fix for bug 4399 2007-02-07 11:50:57 -05:00
Bill Hoffman 98a5bbd3aa ENH: fix depend bug in qt 2007-02-02 16:51:51 -05:00
Alexander Neundorf 94550852eb BUG: finally fix #4331, the previous version just caught the tag, the
filename not at all

Alex
2007-01-31 15:06:07 -05:00
Andy Cedilnik 66718107db COMP: Fix typo that makes all Qt4 builds break 2007-01-20 10:05:23 -05:00
Bill Hoffman c9c18982f3 BUG: fix for bug 4331 2007-01-19 11:55:39 -05:00
Bill Hoffman 51bf1bd99a BUG: fix for bug 4331 2007-01-18 20:35:07 -05:00
Alexander Neundorf 7ab81d187e ENH: if a wrong qmake has been found, mark it as invalid in the cache, so
that it is searched again the next time cmake runs
Tested in KDE since Jul 5th:
http://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake?rev=558318&view=rev

Alex
2007-01-04 17:29:01 -05:00
Alexander Neundorf 4167622667 ENH: add QT_USE_QTDBUS as it exists for all other modules too
Alex
2007-01-04 16:50:18 -05:00
Alexander Neundorf f53f0565a7 BUG: also look for qmake4, as it is named on OpenBSD
Alex
2007-01-04 16:35:47 -05:00
Alexander Neundorf 5826ce439c ENH: partly sync with KDE svn: add the macros for generating the dbus files
Alex
2007-01-03 18:20:55 -05:00
Alexander Neundorf 4fbcdccd22 ENH: mark more variables ADVANCED
Alex
2007-01-03 17:50:16 -05:00
Alexander Neundorf 1626da56a9 ENH: partly sync with KDE svn: handle QtMain more like the other libs
Alex
2007-01-03 17:32:02 -05:00
Alexander Neundorf c864c8f466 BUG: argument names in macros are not real variables, which can lead to problems, which we fixed for KDE in Trysil: http://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake?rev=557470&r1=557241&r2=557470
Alex
2007-01-03 17:00:36 -05:00
Alexander Neundorf c8c4b68951 STYLE: some more space to make it easier to read
Alex
2007-01-03 16:48:08 -05:00
Alexander Neundorf f35f487d80 ENH: partly sync with KDE svn: also find the QtDBus and the QtDesignerComponents libraries
Alex
2007-01-03 16:38:26 -05:00
Alexander Neundorf 2c480fd228 ENH: partly sync with the KDE vesion: find the dbus tools coming with Qt since 4.2
Alex
2007-01-03 16:01:59 -05:00
Bill Hoffman ba238d785f ENH: add depend information from qrc files 2006-11-13 14:22:08 -05:00
Bill Hoffman 86d2d989ce ENH: look for QtAssistantClient4 2006-11-02 17:51:36 -05:00
Bill Hoffman 4d89019426 BUG: fix for bug#3898 find qt plugin dir 2006-10-13 11:23:44 -04:00
Bill Hoffman 009dc7daae ENH: make qmake-qt4 really work if qmake is qt3 also fix indent in file, for diff use cvs diff -w 2006-10-04 10:33:10 -04:00
Bill Hoffman 26d31fc2a0 BUG: fix for bug#3720 2006-10-03 14:39:05 -04:00
Bill Hoffman a178761c12 ENH: fix from clinton 2006-10-02 09:03:17 -04:00
Bill Hoffman 207292cf45 ENH: fixes from Clinton to allow qt to work with static libs 2006-09-06 08:31:50 -04:00
Bill Hoffman 89fb18f548 ENH: fix for qtmain 2006-08-01 15:48:44 -04:00
Bill Hoffman 612d2f667b ENH: fix for location of error log 2006-08-01 15:24:46 -04:00
Bill Hoffman b2ebcb5eb3 ENH: add QtCored as a possible name for qtcore debug 2006-08-01 14:34:53 -04:00
Bill Hoffman 1b58308b98 ENH: fix for optimized debug stuff 2006-08-01 12:27:53 -04:00
Bill Hoffman 7776d18896 ENH: fix qtmain for release 2006-08-01 11:26:32 -04:00
Bill Hoffman 4cafb72616 ENH: fix qtmain for release 2006-08-01 10:51:17 -04:00
Bill Hoffman c75fb61f3c ENH: put back find qtmain 2006-08-01 09:12:18 -04:00
Andy Cedilnik 63c241ea1e ENH: Updates from KDE 2006-06-16 14:45:47 -04:00
Ken Martin 8e9a6beccc ENH: centralized locaiton of CMakeFiles setting 2006-06-14 12:28:32 -04:00
Bill Hoffman 9704c8f8c3 ENH: add qtmain to findqt 2006-05-25 11:56:49 -04:00
Alexander Neundorf a86c766d2a BUG: kde3: use QT_UIC_EXECUTABLE instead of simply uic
BUG: use qouting for the path to Qt4 moc and uic, should help with paths
with spaces

Alex
2006-05-19 16:57:49 -04:00
Bill Hoffman 58d0d056c4 ENH: remove bad quoteed code 2006-05-12 10:56:12 -04:00
Bill Hoffman 2c80b0fa70 ENH: fix path problem with qt 2006-05-12 09:47:26 -04:00
Bill Hoffman 6e64163019 ENH: fix for bug 3216 allow full path to qt input files 2006-05-11 10:41:42 -04:00
Bill Hoffman e0924bbb16 ENH: fix windows path issue 2006-05-05 15:04:39 -04:00
Bill Hoffman 38373b5d4c ENH: fix qt version detection 2006-05-02 14:04:26 -04:00
Alexander Neundorf 64cf77f823 ENH: use the ADD_FILE_DEPENDENCIES() macro coming with cmake instead a
duplicated implementation _qt4_add_file_dependencies() here

Alex
2006-04-27 15:14:25 -04:00
Alexander Neundorf f59ad1aa6e ENH: -apply the patches by Clinton Stimpson and Kenneth Moreland which fix
some QtMain issues on Windows
ENH: -sync with KDE svn FindQt4, which features a lot of enhancements

Alex
2006-04-27 15:07:23 -04:00
Andy Cedilnik b5b06cfaf6 BUG: Fix typo 2006-02-28 11:14:16 -05:00
Andy Cedilnik 2251970c1d ENH: Add support for debian having both qt3 and qt4 2006-02-28 11:13:44 -05:00
Bill Hoffman 7603244509 ENH: use program files env for searching 2006-02-28 10:27:30 -05:00
Brad King dd710c9482 BUG: Fixed qt version message. Submitted by Tanner Lovelace. 2006-02-08 09:51:18 -05:00
Bill Hoffman b442e86492 ENH: change to fatal error 2006-01-25 12:16:49 -05:00
Bill Hoffman 19e566d395 ENH: add qt quiet stuff 2006-01-09 12:45:37 -05:00
Ken Martin 74eaecfc3e ENH: cleanups 2005-12-15 14:17:43 -05:00
Bill Hoffman b7fa820118 ENH: add documentation support for modules 2005-12-14 13:51:08 -05:00
Bill Hoffman eee1a7ec4c ENH: fix typo 2005-09-19 12:19:59 -04:00
Bill Hoffman c6fbe4a980 ENH: only add optional qt stuff to QT_INCLUDES 2005-09-14 11:16:02 -04:00
Bill Hoffman 908db09b47 ENH: add some checks on the qmake install 2005-09-13 09:25:29 -04:00
Bill Hoffman 9405e30218 ENH: more findqt fixes 2005-09-12 22:39:12 -04:00
Bill Hoffman 74918bfc87 ENH: add new place to search for qt4 in registry 2005-09-12 11:43:24 -04:00
Bill Hoffman 5eb6aea9df ENH: use correct variable for qmake 2005-09-12 09:55:02 -04:00
Bill Hoffman 85856f2f14 ENH: add a better message 2005-09-12 09:52:26 -04:00
Bill Hoffman 34170ed52e ENH: more qt changes 2005-09-12 09:32:21 -04:00
Bill Hoffman f52977a9f7 ENH: make sure the correct qmake is used 2005-09-12 09:00:55 -04:00
Bill Hoffman afbc9b7b07 ENH: clean up the find qt stuff some 2005-09-09 21:51:23 -04:00
Bill Hoffman b64b020f09 ENH: add Ken Morelands fixes for FindQT 2005-09-08 09:58:41 -04:00
Bill Hoffman b058a5e1aa ENH: some clean up from Clinton 2005-08-10 12:50:56 -04:00
Bill Hoffman df37d871c4 ENH: fixed up qt stuff from Clinton Stimpson 2005-08-10 08:48:03 -04:00
Bill Hoffman a95fef3d1c ENH: add changes for qt4 from Clinton Stimpson 2005-08-02 16:44:00 -04:00
Bill Hoffman feb5019890 ENH: add changes for qt4 from Clinton Stimpson 2005-08-02 16:34:23 -04:00
Bill Hoffman 380f8f6b4b ENH: make sure qmake is on the machine before running it 2005-07-20 12:48:12 -04:00
Bill Hoffman dc1426b6a3 ENH: add new qt stuff from warfield@bwh.harvard.edu, thanks 2005-07-15 12:14:47 -04:00