summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Contact -> qt-project.orgEike Ziller2012-07-193426-10258/+3432
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-07-192-2/+2
|\ | | | | | | | | | | | | | | Conflicts: src/libs/zeroconf/embed/DebugServices.h tests/system/shared/project.py Change-Id: I990f6b87ef8570317caf705bbca465a1a01f64b2
| * Don't build mdnssdThiago Macieira2012-07-1926-37548/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This was enabled for Linux only, but Linux users should use Avahi, which is present on most modern distributions, and implements mDNS functionality. Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com> (cherry picked from commit 272e9a37f38896e899ce46355abcdd412fc247bc) Change-Id: I5e17ff9b8bff6eae9af2f8281937afdb687c371f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| * Disable QGraphicsDropShadowEffect for MacAurindam Jana2012-07-123-0/+16
| | | | | | | | | | | | | | | | | | | | | | The QGraphicsDropShadowEffect::draw() results in a crash on Mac https://bugreports.qt-project.org/browse/QTBUG-23205 . Task-number: QTCREATORBUG-7605 Change-Id: Icee71e6452997b2daede7ef4735e508caf68aa1a Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> (cherry picked from commit d0152332a47837e1ec8522175a0a6d3571c4fba5) Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
| * Fix crash on unloading Qt4 projectsDaniel Teske2012-07-042-2/+2
| | | | | | | | | | | | Change-Id: I6e05026e87ba1cf8a8e9d40fac7dd33c82f5a3ff Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | ressourceeditor: compile fixhjk2012-07-191-1/+1
| | | | | | | | | | Change-Id: I03f687598b30d5a8c4bd8e3baf4e362fcbcf2a4c Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Git: Limit length for revisions displayed in context menuOrgad Shaneh2012-07-191-3/+10
| | | | | | | | | | Change-Id: I335b49ed9af9c3f2ae083a03e4109173b3783f76 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Git: Use HEAD as parent revision for 00000000Orgad Shaneh2012-07-191-0/+5
| | | | | | | | | | Change-Id: I4f583bb184fff00ea49a27de9df96aa348b81004 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | ResourceEditor: Fix compilation with namespaced Qt.Christian Kandeler2012-07-181-3/+1
| | | | | | | | | | | | | | | | Also change misleading comment. Change-Id: I22666ae3a06b98dea0be35d95392ae4e022b0d73 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: hjk <qthjk@ovi.com>
* | debugger: code cosmeticshjk2012-07-182-78/+79
| | | | | | | | | | | | | | Namespaces, whitespace. Change-Id: I83df57b32a1a31b208181d65849688c09941a0be Reviewed-by: hjk <qthjk@ovi.com>
* | profilechooser: run init() in constructorhjk2012-07-183-15/+5
| | | | | | | | | | Change-Id: I4387b52f2d929ffa096bf2d931eb692b6798f45a Reviewed-by: hjk <qthjk@ovi.com>
* | Fix compilation issue for Botan for MinGW (no gmtime_s)Lukas Geyer2012-07-182-4/+4
| | | | | | | | | | | | | | MinGW does not come with a gmtime_s function (only MSVC does). BOTAN_TARGET_OS_HAS_GMTIME_S is now set for win32-msvc* only. Change-Id: Ic2aefed68acd32b1e67046455b2f230096dd83d0 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* | Moved QrcEditor to ResourceEditor plugin.Konstantin Tokarev2012-07-1818-36/+27
| | | | | | | | | | Change-Id: I623b47ab4fdad7abf07e47abd99959f0326639c6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Compile fix for WindowsRobert Loehning2012-07-181-1/+1
| | | | | | | | | | Change-Id: I0305e78dfc20ce398a06dac32c6368bfa1ec8b63 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Added overload for FileName::isChildOfKonstantin Tokarev2012-07-183-1/+8
| | | | | | | | | | Change-Id: I9c5b0e7f3eda13ef3b6903723c27267d090b9d24 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | fakevim: Incorrect commands with nested parentheseshluk2012-07-181-8/+81
| | | | | | | | | | | | | | | | | | Commands in normal mode like "ci(", "di[", "ca{" etc. should handle nested parentheses correctly. task-number: QTCREATORBUG-7632 Change-Id: I7a77ffa61ff7675f0dc8c66918136c2573cf4c06 Reviewed-by: hjk <qthjk@ovi.com>
* | debugger: add dumper for Core::Idhjk2012-07-181-0/+6
| | | | | | | | | | Change-Id: Ibcc5b0e80acf037ed87b79ae4f52a1b0677388eb Reviewed-by: hjk <qthjk@ovi.com>
* | Fix compileDaniel Teske2012-07-182-4/+3
| | | | | | | | | | Change-Id: I1f9afb9f802d8eae4d95e8505328d1dccafdc98a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Implemented file rename in ResourceEditor.Konstantin Tokarev2012-07-1810-40/+162
| | | | | | | | | | | | | | | | | | | | Renaming supports version control. To prevent code duplication part of ProjectExplorerPlugin::renameFile implementation was separated into FileUtils::renameFile. Change-Id: I28481bea89d0824339e5db025ceb7216713bd5a0 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Creating profiles: Set toolchain before the mkspecDaniel Teske2012-07-181-1/+1
| | | | | | | | | | | | | | | | The mkspec setting function checks whether the value is the same as the default, but the default depends on the toolchain. Change-Id: I2ff55efbf365617b117301224e23d616dc7db25e Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | QmlProject: static_cast not qobject_castDaniel Teske2012-07-181-6/+2
| | | | | | | | | | Change-Id: I8104dab231a183a7768b3c1ac8c34b7ba4e47fdb Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Qt4Project: static_cast not qobject_castDaniel Teske2012-07-181-2/+2
| | | | | | | | | | Change-Id: I76483e6aae8b5144f9f896b3c60795e3ae5ade11 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Qt4ProFileNode: static_cast not qobject_castDaniel Teske2012-07-181-1/+1
| | | | | | | | | | Change-Id: I0b8f168be6e85888b02a11682c21e7b63a33f75f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Run QMake, static_cast not qobject_castDaniel Teske2012-07-181-4/+1
| | | | | | | | | | Change-Id: Ib9be214838d8e10dbd1a870d894bf7485265a43e Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | MaemoRpmPackageCreationStep: Change back to use '/' instead of '\'Daniel Teske2012-07-181-2/+2
| | | | | | | | | | | | | | That is on Windows. Change-Id: I2f6e9e0118e2deb3238e73479a3160536857a372 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | CMakeProjectManger: static_cast instead of qobject_castDaniel Teske2012-07-181-3/+1
| | | | | | | | | | | | | | It's a CMakeProject, it must be a CMakeBuildConfiguration Change-Id: Ibd0907112661a89f7ca84ffdf62a1dbcbd436ed8 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Qt4: static_cast instead of qobject_castDaniel Teske2012-07-181-1/+1
| | | | | | | | | | Change-Id: I6a09b19c18ecb5d643ffad874f1138a7f24ab295 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | CMakeBuildConfiguration: Less qobject_casts more static_castsDaniel Teske2012-07-182-8/+5
| | | | | | | | | | | | | | CMakeBuildConfigurations can only exist on CMakeProjects Change-Id: I8501e39f133fea854b953f9739e001cae1f2c0ea Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Remove never called removeUnconfiguredCustomExectutableRunConfigurationsDaniel Teske2012-07-182-17/+0
| | | | | | | | | | Change-Id: Ieb8bb1ec3ad9a4a68ae1c95fe1b3effff386c605 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Remove left over qt4desktoptargetfactory.cppDaniel Teske2012-07-181-147/+0
| | | | | | | | | | Change-Id: Ie7dbadb709d04da01c48d736a0bc91856e9304cc Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Remove duplicated includesDaniel Teske2012-07-181-4/+2
| | | | | | | | | | Change-Id: I113e4c2afc6c881bc9c62f7ff08dbc69005037a5 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Make AndroidManager completely staticDaniel Teske2012-07-183-33/+0
| | | | | | | | | | | | | | | | | | All the methods are static now, so there's no need to instanciate the class. Change-Id: Ibb615f1f863ed1ad8e27dfb44d69998ea1061550 Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | CMakeRunConfiguration: Check once with object_cast for CMakeProjectDaniel Teske2012-07-181-1/+1
| | | | | | | | | | | | | | And then use that knowledge to simply do a static_cast Change-Id: Ia145468235ed0b75ed243d6ae2d76ab824df2958 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Remove CMakeRunConfiguration::activeBuildConfiguration()Daniel Teske2012-07-182-7/+0
| | | | | | | | | | | | | | It's the same as RunConfiguration::activeBuildConfiguration Change-Id: I117edbe2347dd40b183ba7e9d2f6ace08645db7e Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Android: Add QML debugging supportTyler Mandry2012-07-175-43/+89
| | | | | | | | | | | | Change-Id: I2fb2c75001569385e417ea44ae90d34e92a22449 Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | vcsbase plugins: Fix mem leakMontel Laurent2012-07-171-1/+1
| | | | | | | | | | | | | | | | | | We must delete private class which delete m_ui too. OTherwise we will leak here Change-Id: I39239ce2fdddd4fe4e4e748673e271bba976c712 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Debugger: Profile -> TargetOrgad Shaneh2012-07-172-2/+2
| | | | | | | | | | Change-Id: If65d7c385eb86a54a4a9bdf51be5b2bf1c3cb429 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Add function return type in outline.Francois Ferrand2012-07-171-3/+4
| | | | | | | | | | | | | | | | Append the function return type in outline (after arguments), consistently with variable type indication. Change-Id: I1cc6d69634fc83227eb7fc9e3a0ee2ad6ca6ace8 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* | use QT_BEGIN_NAMESPACE instead of QT_FORWARD_DECLARE_CLASShjk2012-07-175-16/+28
| | | | | | | | | | | | | | Less confusing to the highlighter. Change-Id: I1c5f232da42b18d43f6c14b5907eb8feb48de2b4 Reviewed-by: hjk <qthjk@ovi.com>
* | C++: Change back highlighting of typesLeandro Melo2012-07-172-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type highlighting change part of the recent patch 4a2a17af8aa157cadb4ec230058d9ae34e11fd66 didn't seem to please much from a visual point of view. It's a better idea to keep the type highlighting as it was for now and in the future try again the approach with an explicit option and perhaps a more restrictive context. The other patch is not reverted entirely because it does fix a couple of bugs. Change-Id: I806afa3d8c1c4b241080b8704255d737f61ee12c Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | projectexplorer: improve spacing in profile selection dialoghjk2012-07-171-5/+10
| | | | | | | | | | Change-Id: I9f6719618749b57cdfb68457e9ede8a580abd1af Reviewed-by: hjk <qthjk@ovi.com>
* | projectexplorer: de-pimpl ToolChainConfigWidgethjk2012-07-172-57/+28
| | | | | | | | | | | | | | | | It contained only two pointers. Not worth the overhead. Change-Id: I512ddfe588b8d072072b8155b4418a2b8e8c4da0 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | qtsupport: hide Qt version data on tree nodes without such datahjk2012-07-171-0/+2
| | | | | | | | | | Change-Id: I075f0962f59d34ea48b7d63753505ddc6bea5dd4 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | profiles: better distribution of spacing in the option pagehjk2012-07-171-1/+7
| | | | | | | | | | Change-Id: I672c1a24ce7a3f6e3d7538550d0289ca8f4df865 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | profiles: some variable renaming (st->profile)hjk2012-07-171-18/+18
| | | | | | | | | | Change-Id: I06da18c8db724e9dbb27878e9280b78b6df299cb Reviewed-by: hjk <qthjk@ovi.com>
* | C++: Changes in semantic highlightingLeandro Melo2012-07-173-138/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix issues with virtual/non-virtual destructors. They were not being correctly identified in some cases - in particular on certain uses in derived classes. - Since now we do have a highlighting item for regular functions, constructors and destructors are now highlighted as such. This is more semantically correct and actually makes navigation and readiblity more distinguishable, since it cleary differentiates the type itself from its uses in expressions and declarators. (This seems to be what other IDEs like Eclipse, Visual Studio, KDevelop are doing.) NOTE: There's a switch to disable this item in the case it doesn't get good acceptance. Actually, the switch can be made a user setting...? - Change the default color scheme so regular and virtual functions have the same color (virtuals continue to be italic). This makes sense given the above mentioned changes in constructors/destructors highlighting behavior. (In other schemes virtual funcions don't have different color, so this shouldn't be necessary in those.) - Small renaming: "members" are now "fields" - consistent, since they apply for data and it's the term used in the UI. Change-Id: Ib1aa9c0bbf28a31d09f5696460b0095fbe29de80 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | move ProfileChooser from Debugger to ProjectExplorerOrgad Shaneh2012-07-179-54/+49
| | | | | | | | | | | | Change-Id: I5a4dcd5b9101118de8c88b6d26af5a9dbb32ba54 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <qthjk@ovi.com>
* | plugins genericprojectmanager: fix mem leak. m_ui was never deletedMontel Laurent2012-07-172-0/+6
| | | | | | | | | | | | Change-Id: I50f98cdfb9372a1a1f78b7c8fe0ad7f39856ea01 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: hjk <qthjk@ovi.com>
* | Added tooltips on completions proposalsSergey Shambir2012-07-173-4/+21
| | | | | | | | | | | | Change-Id: Ic22b99e25159edfa4977e13c98f334ce75809af7 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Use mkspec of the Qt version of qmake when matching profilesDaniel Teske2012-07-171-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | In case the qmake-line does not contain a mkspec argument, use the mkspec of the Qt version found by matching the qmake binary. This reduces the duplication of targets/profiles when opening new projects. Change-Id: I647e166ae0322fd093967abea760197cf4c7eedd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
View Lorry Controller Status