summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'string-apis-fix-cmake-gui'Brad King2014-03-131-1/+1
|\ | | | | | | | | ae32622b cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)
| * cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)Brad King2014-03-121-1/+1
| | | | | | | | | | | | | | Since commit 1a1b737c (stringapi: Use strings for generator names, 2014-02-24) cmExternalMakefileProjectGenerator::CreateFullGeneratorName expects a std::string instead of const char*. When no extra generator name is available, pass an empty string to avoid NULL dereference.
* | Unicode: cmake-gui encoding now matches KWSys encoding.Clinton Stimpson2014-03-112-0/+13
|/ | | | | | A UTF-8 QTextCodec is used with QString when KWSys is configured to treat strings as UTF-8. This means QString::toLocal8Bit() will convert to UTF-8.
* stringapi: Use strings for cache iterator valuesBen Boeckel2014-03-081-6/+6
|
* cmake-gui: Remember variable type in Add EntrySergey Zolotarev2014-01-164-16/+62
| | | | | | | | | | | Store variable types together with their names in the variable completion list so that the type is automatically recovered when you select a variable. Keep variable names and types in separate lists. This removes the :TYPE string from completion list and the Name field and makes variable search easier. The variable names and types are now kept in two different settings - AddVariableNames and AddVariableTypes. Drop the old AddVariableCompletionEntries setting.
* Use Encoding::CommandLineArguments for main() functions.Clinton Stimpson2014-01-041-5/+11
|
* Merge topic 'cmake-credits'Brad King2013-11-222-0/+18
|\ | | | | | | | | 8ad8a9b cmake-gui: Reference LGPLv2.1 when redistributing Qt
| * cmake-gui: Reference LGPLv2.1 when redistributing QtBrad King2013-11-212-0/+18
| | | | | | | | | | | | | | | | | | Download http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and place it as Licenses/LGPLv2.1.txt in our source tree. When building cmake-gui, use option CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL to enable notification in the "About" dialog of how the distribution of Qt is licensed. Install the license file as ${CMAKE_ROOT}/Licenses/LGPLv2.1.txt so that the dialog can display a path to it.
* | Merge topic 'qt-dialog-reconfigure'Brad King2013-11-221-0/+1
|\ \ | |/ |/| | | | | b566987 cmake-gui: Configure again if a variable is changed before Generate is pushed.
| * cmake-gui: Configure again if a variable is changed before Generate is pushed.Clinton Stimpson2013-11-211-0/+1
| |
* | Credit Kitware and csimsoft for their maintenance rolesBrad King2013-11-191-4/+8
|/ | | | | Add maintenance credit to command-line "--version" output and the cmake-gui "About" dialog.
* Merge topic 'cmake-distribution-config'Brad King2013-11-132-5/+5
|\ | | | | | | | | | | | | 06b0dbe OS X: Drop version number from CMake.app bundle name (#11693) 84af42b Configure NSIS-packaged CMake version and install destination 7655029 Configure NSIS-packaged CMake documentation link in Start Menu
| * OS X: Drop version number from CMake.app bundle name (#11693)Brad King2013-11-122-5/+5
| | | | | | | | | | | | | | | | | | Always name the application bundle "CMake.app". Users can rename it after installation if they wish. This is the typical approach used by OS X applications, including Xcode. It allows CMake to be upgraded without manually re-running CMake in every build tree to update the path to CMake. It also makes the executable location in the CMake build tree more predicatable.
* | cmake-gui: Parse Copyright.txt instead of duplicating noticeBrad King2013-11-121-1/+4
|/ | | | | Set the cmake-gui MACOSX_BUNDLE_COPYRIGHT property by parsing the copyright notice line out of Copyright.txt instead of duplicating it.
* Refactor internal resource location APIs and initializationBrad King2013-11-123-25/+10
| | | | | | | | | | | | | | | | | | | | Rename cmSystemTools::FindExecutableDirectory to FindCMakeResources. Teach it to compute the locations of cmake, ctest, cpack, ccmake, and cmake-gui executables, and the location of CMAKE_ROOT. Provide this information from static cmSystemTools::Get<resource>() methods. Refactor code that needs these locations to use the new APIs. Teach FindCMakeResources to use the OS X system API to lookup the executable location. When running from the CMake build tree itself, leave a file in the tree that FindCMakeResources can use to read the location of the source tree. This avoids the need to compile the source tree location into a binary that may be installed and used without the source tree. Teach the QtDialog on OS X to create a "cmake-gui" symlink in the build tree next to "cmake" and the other tools, as is already done in the install tree for the application bundle. This ensures a consistent set of executables are available in one directory.
* cmake-gui: Rename local variable to avoid shadowing a memberBrad King2013-11-011-22/+22
| | | | | | | | | | | Address warnings: Source/QtDialog/CMakeSetupDialog.cxx:1233:15: warning: declaration of 'cursor' shadows a member of 'this' [-Wshadow] Source/QtDialog/CMakeSetupDialog.cxx:1260:15: warning: declaration of 'cursor' shadows a member of 'this' [-Wshadow] by renaming the local variable to 'textCursor'.
* Make --help-* options available from all command-line toolsBrad King2013-10-161-6/+1
| | | | | | | | | | | Make the standard --help-* options available from all command-line tools. Drop options that are no longer supported: --copyright, --help-full, --help-html, --help-man, --help-compatcommands, --help-custom-modules De-duplicate Help/manual/*.1.rst help options by using an OPTIONS_HELP.txt file included from each manual.
* Drop the 'Full' field from cmDocumentationEntryBrad King2013-10-161-8/+8
| | | | | We need only 'Brief' for usage documentation. We no longer have builtin 'Full' documentation, which is now in Help/*/*.rst files.
* Drop "full" documentation output typesBrad King2013-10-151-22/+0
| | | | | | | | | | | | | | | | We will no longer support full documentation generation from executables and will instead generate documentation with other tools. Disable (with a warning left behind) the command-line options: --copyright --help-compatcommands --help-full --help-html --help-man Drop supporting code. Drop manual sections generation from executables. Remove internal documentation construction APIs. Drop unused sections See Also, Author, Copyright, Compat Commands, Custom Modules.
* Merge topic 'osx-cmake-app-info-plist'Brad King2013-10-092-1/+38
|\ | | | | | | | | dcf1b64 OS X: Set CMake.app bundle Info.plist fields (#11694)
| * OS X: Set CMake.app bundle Info.plist fields (#11694)Brad King2013-10-082-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Apple Info.plist reference documentation: Core Foundation Keys https://developer.apple.com/library/mac/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html Launch Services Keys https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html Cocoa Keys https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html modify the Info.plist we create for cmake-gui to add/set fields CFBundleShortVersionString = The release-version-number string LSApplicationCategoryType = UTI that categorizes the app for the App Store NSHumanReadableCopyright = Specifies the copyright notice and drop fields CFBundleGetInfoString CFBundleLongVersionString LSRequiresCarbon Also prepare to set CFBundleVersion = The build-version-number string but leave it commented out as TBD (To Be Determined) for now. The version fields must have form <major>.<minor>.<patch> with integer components. While at it, rename the bundle to end in ".<patch>" instead of "-<patch>" so that it is consistent with the version number and does not look like a packaging increment suffix.
* | cmake-gui: save and restore the geometry and window state between sessions.Clinton Stimpson2013-09-101-5/+4
|/
* cmake-gui: Fix build rules for Qt5 on WindowsBrad King2013-08-071-0/+18
| | | | | Set policy CMP0020 to NEW to get WinMain from Qt. Fix the documentation custom command PATH for cmake-gui to find the Qt5 DLLs.
* Merge topic 'doc-improvements'Brad King2013-05-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 7cc2805 Docs: Clarify wording "flag used" => "flag (to|will) be used" 2378a69 Docs: Clarify that CMAKE_*_(PREFIX|SUFFIX) affect filenames 56ca34d Docs: Update description of CMAKE_(BUILD_TYPE|CONFIGURATION_TYPES) 2bab472 VS10: add detailed comment about MIDL processing e619111 Explain distribution of Win9x binary on all Windows versions. 5ca4336 FindwxWidgets: add DOC strings with usual style f57800d Fix spelling and typos (product names) bf019d7 Fix spelling and typos (non-binary) ddac8d3 Fix spelling and typos (affecting binary data / module messages) 86832ce Fix spelling and typos (affecting users)
| * Fix spelling and typos (product names)Andreas Mohr2013-05-071-1/+1
| | | | | | | | API, Borland, MinGW, UNIX, Mac OS X.
* | cmake-gui: use shortcut F only for "Find in Output"Alex Neundorf2013-04-241-2/+2
| | | | | | | | | | | | Before it was used also for "Find Next" and "Find Previous" Alex
* | cmake-gui: Add function for going to next error message in Output windowMarc Bartholomaeus2013-04-242-2/+67
| | | | | | | | | | | | Using new shortcuts: F8 (Visual Studio) and Ctrl-. (Eclipse) Signed-off-by: Alex Neundorf <neundorf@kde.org>
* | cmake-gui: Change shortcut of the search field from Ctrl-F to Alt-EMarc Bartholomaeus2013-04-242-7/+7
| | | | | | | | | | | | Ctrl-F is now used by "Find in Output". Signed-off-by: Alex Neundorf <neundorf@kde.org>
* | cmake-gui: Add search functions to the context menu of the Output widgetMarc Bartholomaeus2013-04-242-0/+21
| | | | | | | | Signed-off-by: Alex Neundorf <neundorf@kde.org>
* | cmake-gui: Add search functions for Output window (#9733)Marc Bartholomaeus2013-04-242-0/+76
|/ | | | Signed-off-by: Alex Neundorf <neundorf@kde.org>
* cmake-gui: Use the QStandardItemModel workaround until 5.1.0.Stephen Kelly2013-03-191-1/+1
| | | | | | | | | | If there is a Qt 5.0.3 release, it may or may not contain the patch that fixes this issue. http://thread.gmane.org/gmane.comp.lib.qt.releasing/882 Just use the workaround until 5.1.0 which certainly will contain the fix. Don't use the workaround before Qt 5.0.0.
* cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModelStephen Kelly2013-03-121-1/+5
| | | | | | | | The commit in qtbase 9dfba89c (Add implementations of QAIM::sibling in public APIs., 2012-09-26) added a buggy implementation of sibling(), and the commit f136701b (Use the base implementation of QAbstractItemModel::sibling in QSIM., 2013-02-21) resolves it. Workaround the bug for Qt releases that have it.
* cmake-gui: Use -fPIE if required by Qt.Stephen Kelly2013-03-121-0/+2
|
* Enable deprecated API when using Qt 5.Stephen Kelly2012-09-231-0/+2
| | | | | | | | | | | The QAbstractItemModel::reset() method is deprecated in Qt 5, and therefore not part of the API by default (on non-Windows). The replacement for it is beginResetModel/endResetModel which are available from Qt 4.6 onwards. The minimum version of Qt required is currently 4.4, so enable the deprecated API instead of changing that.
* Build with Qt5 if it is found.Stephen Kelly2012-08-221-6/+23
|
* Compile with both Qt4 and Qt5.Stephen Kelly2012-08-211-0/+4
|
* Replace two include_directories with a setting.Stephen Kelly2012-08-211-2/+1
|
* Remove an if which is always true.Stephen Kelly2012-08-211-7/+6
| | | | CMake based CMake build requires version 2.8.2 as of version 2.8.9.
* Move variable setting down to where it relates to.Stephen Kelly2012-08-211-1/+1
|
* Use CMake platform variables instead of Qt ones.Stephen Kelly2012-08-211-2/+2
| | | | The Qt ones no longer exist in Qt 5.
* Add a return-after-error if an old Qt is found.Stephen Kelly2012-08-211-94/+93
| | | | No need for an else after a return.
* Remove CMake-language block-end command argumentsKitware Robot2012-08-132-12/+12
| | | | | | | | | | | | | | | | | 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
* Convert CMake-language commands to lower caseKitware Robot2012-08-132-52/+52
| | | | | | | | | | | | | | | | | 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
* Remove trailing whitespace from most CMake and C/C++ codeKitware Robot2012-08-1311-104/+104
| | | | | | | | | | | | | | | | | 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/ \+$//'
* Ensure 3rd party libraries are writable.Nicolas Despres2012-07-171-4/+5
| | | | | This patch fixes CMake.Install when Qt4 is installed read-only by packaging system like Homebrew.
* cmake-gui: Fix code to respect current locale.Clinton Stimpson2012-07-066-86/+90
| | | | | This means non-ascii characters now work correctly on systems that have a non-ascii 8 bit encoding as the current locale.
* cmake-gui: Wait for configure/generate thread to complete before exiting.Clinton Stimpson2012-04-301-1/+1
| | | | A prevous fix to interrupt granularity makes it so we don't have to wait very long.
* Merge topic 'ImproveCPackDoc-reloaded'David Cole2012-02-141-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4b77eb Avoid discovering system infos for documentation. Adding some path is enough. 9002f73 Fix non existent std::string::clear on VS6 02ccb32 Create getDocumentedModulesListInDir which may be used in other context. 24fbc28 Add missing section markup for CPackComponent bafd8a9 Example of builtin variable documentation (i.e. only used in C++ source code). 543f1ad Make the load of script documentation more efficient and dynamic. cdbd1a9 Fix another compiler warning due to a typo 52c53de Really avoid compiler warning about unused vars 37f90ed Calm down compiler warning about unused var 7c82b7f Fix potential bad memory access, thanks to Eike 62b589b Suppress unused var, beautify code, avoid 1 extra newline. 751713f Update bash completion file in order to handle new CPack doc options. 1629615 CPack Documentation extraction from CMake script begins to work 83e34dd Implement simple CMake script comment markup language. c6a0169 CPack begin the implementation of --help-command* and --help-variables*
| * CPack begin the implementation of --help-command* and --help-variables*Eric NOULARD2012-01-221-0/+1
| | | | | | | | | | | | This modifications set tries to keep the unified doc for cmake/ctest/cpack while introducing tool specific documentation separated. Some documentation sections for CMake do not fit well to CPack.
* | cmake-gui: Improve interrupt granularity to fix bug 12649.Clinton Stimpson2012-01-024-6/+19
|/ | | | | | | Instead of enabling interrupt only when a progress or message callback is called, add a new callback specifically for interrupt. This new callback is called from GetFatalErrorOccured() so cmake-gui can immediately report interrupt status instead of calling queuing a call to cmSystemTools::SetFatalErrorOccured() and waiting for the progress or message callback to be called to process that queued call.