summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager
Commit message (Collapse)AuthorAgeFilesLines
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-03222-444/+444
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* projectexplorer: More consistent '...'hjk2011-11-021-3/+3
| | | | | | | Used for buttons that open additional dialogs, but not comboboxes. Change-Id: I9b40eac236f18b4c0b2e358ddeccb953024e8d50 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Qt: Pick tool chain that works with the default mkspecTobias Hunger2011-10-312-0/+15
| | | | | | | | | | | Pick a tool chain that suggests the same mkspec as the Qt version was build with if possible. This should help with the case of us choosing the wrong tool chain on mac. Change-Id: I206658fd36f2f3c2223392a2c69cf264b5b6a54e Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Fix memory leaks (lacking destructors for uis)Jarek Kobus2011-10-284-0/+12
| | | | | | Change-Id: I07c2708d727d59286b0d625a4c0c318f18b03b93 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* CODA: Increased timeout for Deploy stepPawel Polanski2011-10-281-1/+1
| | | | | | | | | The 2s work perfectly for most cases. However, while deploying via WLAN sometimes due to weak signal the 2s is not enough Change-Id: If3a8bfbf6c4a244e589c1620a5c953486a0524d0 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix leakDaniel Teske2011-10-271-0/+1
| | | | | Change-Id: I5d7b0faf4c0331eb88f75a2f778eaa71ca8fa10a Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix bug with unclean paths with multiple .pro files in the same dirDaniel Teske2011-10-271-1/+1
| | | | | | | Task-number: QTCREATORBUG-6414 Change-Id: Idb9277e951270688766b1e569c7ae0f962b2e4c3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* "Build Issues" was renamed to "Issues"Robert Loehning2011-10-253-3/+3
| | | | | Change-Id: If514e2497a52456bfd16aaebf2a7c83def4621f7 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Make sure we pass -after arguments after user argumentsDaniel Teske2011-10-213-7/+19
| | | | | | | | Otherwise the user can't pass on normal arguments Task-number: QTCREATORBUG-6346 Change-Id: I986563a75113a6d5acf601b5ccb63d6a35570bad Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix -spec parameter not used in profile evaluation nor code modelDaniel Teske2011-10-184-3/+22
| | | | | | | Task-number: QTCREATORBUG-4723 Change-Id: I845326bdc8726c27502c66c5aeaacb0d286c54c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge branch '2.3' into 2.4Oswald Buddenhagen2011-10-185-6/+6
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/commonoptionspage.ui src/plugins/madde/maemoqtversion.cpp src/plugins/projectexplorer/runsettingspropertiespage.ui Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
| * Fixed some typos and added some missing ellipisesJure Repinc2011-10-055-6/+6
| | | | | | | | | | | | | | | | | | | | During translation into Slovenian I noticed some typos in original string. For example some missing ellipsis characters and some incorrectly spelled MeeGo names (as Meego) Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41 Merge-request: 2200 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Symbian^3 specific include paths addedPawel Polanski2011-10-171-1/+7
| | | | | | | | | | Change-Id: I003066e7aaebaf4508695b8588bb8bea893f992c Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Actually delete CONFIG+=declarative from list of user argumentsKai Koehne2011-10-131-0/+1
| | | | | | | | | | | | | | Fix incorrect merge in b0efd44d20e9129c40b47ad3715c248962a947b9 . Change-Id: I7b007cdaf89732336463685a1af7000584a46e6e Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Check all Makefile* for importing buildsDaniel Teske2011-10-102-55/+74
| | | | | | | | | | | | | | | | | | | | | | | | Correctly import both MAKEFILE=Makefile.something in the .pro file, and makefiles created via qmake MAKEFILE=Makefile.other. Also correctly handles multiple Makefiles in one directory. Task-number: QTCREATORBUG-6120 Change-Id: I9c04399aaea7c38f2a4ed2877195f2e36c8f20c7 Reviewed-on: http://codereview.qt-project.org/6347 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* | Qt4ProjectManager: Remove outdated forward declaration.Christian Kandeler2011-10-051-1/+0
| | | | | | | | | | | | Change-Id: I10024c9762c748d119afe559ea2838adf5e13739 Reviewed-on: http://codereview.qt-project.org/6067 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* | Use builddir not project dir for expanding relative libs pathsDaniel Teske2011-10-041-1/+1
| | | | | | | | | | | | | | Change-Id: Id9743739fafe42c3d0f695cec0342b68544c64b0 Reviewed-on: http://codereview.qt-project.org/5992 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Add missing baseEnvironmentChanged signalDaniel Teske2011-10-041-1/+7
| | | | | | | | | | | | | | | | | | | | The base environment depends on *all* library pro files. Do emit baseEnvironmentChanged accordingly. Change-Id: Ia24f3d65492fbe7d2bb4f9fa9e46202ae1764213 Reviewed-on: http://codereview.qt-project.org/5991 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fix restoring of Qt4RunconfigurationsDaniel Teske2011-10-043-3/+3
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-6228 Change-Id: Ib4f4890cb4c9ef10ddf2cdf3d6946601708ee7e6 Reviewed-on: http://codereview.qt-project.org/5979 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Reduce number of categories and minimum size of preferencesEike Ziller2011-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | Merges the Project, Qt4 and Tool Chain categories into one Build & Run category, which makes it finally possible to reduce the minimum height of the preferences dialog. Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138 Reviewed-on: http://codereview.qt-project.org/5023 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Fix setToolchain, upsDaniel Teske2011-09-281-1/+1
| | | | | | | | | | | | | | Change-Id: Ie300f6786336a663e12e52a2546e8ebf0458e080 Reviewed-by: pending Reviewed-on: http://codereview.qt-project.org/5728 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Fix endless evaluate loop for invalid qtsDaniel Teske2011-09-281-0/+3
| | | | | | | | | | | | Change-Id: Id4ba165f95876cc0b986f5db7e6a788c3fdb2dc0 Reviewed-on: http://codereview.qt-project.org/5709 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Qt4ProjectManager: Export Qt4Manager.Christian Kandeler2011-09-261-1/+3
| | | | | | | | | | | | | | Change-Id: I4de9f5b0cdda0065f415b6d4e915343bd49fad14 Reviewed-on: http://codereview.qt-project.org/5543 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Toolchain: Allow all tool chainsTobias Hunger2011-09-236-1/+30
| | | | | | | | | | | | | | | | | | | | Allow all tool chains if either the Qt version is invalid or no Qt modules are not selected. Change-Id: I9842c30aca0a8752915548dc258f257c3fd39e4d Reviewed-on: http://codereview.qt-project.org/4990 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Make Qt4ProjectManager::QMakeStep mulithreading safeDaniel Teske2011-09-231-8/+9
| | | | | | | | | | | | Change-Id: I41abb5e7138351e61c6c9dfc87121837edb21fbe Reviewed-on: http://codereview.qt-project.org/5452 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Make Qt4ProejctManager::MakeStep::run multithreading safeDaniel Teske2011-09-231-2/+2
| | | | | | | | | | | | Change-Id: I416360d35681d2721878cb9fefd861d6e1f209b4 Reviewed-on: http://codereview.qt-project.org/5451 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Remove unused memberDaniel Teske2011-09-231-1/+0
| | | | | | | | | | | | Change-Id: Icb404090885619f76a0a34861da8474c0f16571d Reviewed-on: http://codereview.qt-project.org/5450 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Implement Code Style schemesJarek Kobus2011-09-231-3/+3
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-5092 Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07 Reviewed-on: http://codereview.qt-project.org/5160 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* | Move wizards' cancel button to the left on Mac.Eike Ziller2011-09-221-1/+11
| | | | | | | | | | | | | | | | | | | | | | It is too far to the left now, but that can't be helped (it's a Qt limitation). Task-number: QTCREATORBUG-6156 Change-Id: I0201356234abb618dc3b573673d512c0a97c4839 Reviewed-on: http://codereview.qt-project.org/5406 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | QmlJS: Only try qmldump on Desktop and Simulator Qt.Christian Kamm2011-09-211-4/+16
| | | | | | | | | | | | | | | | | | | | In particular, don't complain about a missing qmldump binary on other platforms. Change-Id: Ie2e96bcb67e609aa5aed31510b06139d2d9ce77e Reviewed-on: http://codereview.qt-project.org/5327 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* | s/error_message/errorMessage/ghjk2011-09-211-1/+1
| | | | | | | | | | | | Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710 Reviewed-on: http://codereview.qt-project.org/5312 Reviewed-by: hjk <qthjk@ovi.com>
* | Consistent names for AbstractGeneratedFileInfo::FileType keysAlessandro Portale2011-09-202-14/+14
| | | | | | | | | | | | | | Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0 Reviewed-on: http://codereview.qt-project.org/4828 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* | remove superfluous semicolon from test wizard's outputJoerg Bornemann2011-09-201-1/+1
| | | | | | | | | | | | | | Change-Id: Id7d5a448c520f3000f686389e50b781bed98b205 Reviewed-on: http://codereview.qt-project.org/1345 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Add Qt4Project::proParsingDone(), which is emitted after parsingDaniel Teske2011-09-192-1/+4
| | | | | | | | | | | | | | | | Change-Id: Id2eb1d2494438bac17f3104ee8a9ed56cc9b1db9 Task-Nr: QTCREATORBUG-6056 Reviewed-on: http://codereview.qt-project.org/4665 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* | minor stylehjk2011-09-195-8/+7
| | | | | | | | | | | | Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7 Reviewed-on: http://codereview.qt-project.org/5122 Reviewed-by: hjk <qthjk@ovi.com>
* | qt4project: disable debug outputhjk2011-09-191-1/+1
| | | | | | | | | | | | Change-Id: I33ae40566677d9b80b27facddab25c1ee7905761 Reviewed-on: http://codereview.qt-project.org/5118 Reviewed-by: hjk <qthjk@ovi.com>
* | all: less QScopedPointerhjk2011-09-192-3/+2
| | | | | | | | | | | | Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2 Reviewed-on: http://codereview.qt-project.org/5116 Reviewed-by: hjk <qthjk@ovi.com>
* | more stylehjk2011-09-1912-139/+140
| | | | | | | | | | | | Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1 Reviewed-on: http://codereview.qt-project.org/5115 Reviewed-by: hjk <qthjk@ovi.com>
* | Fix proFileUpdated signalDaniel Teske2011-09-163-38/+34
| | | | | | | | | | | | | | | | | | | | | | Make sure it is always emitted if the parseInProgress state changes Change-Id: I0e8dc6df5c68f14bd51885c078e909be10af8efa Task-Nr: QTCREATORBUG-6057 Reviewed-on: http://codereview.qt-project.org/4657 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* | debugger: hard-code some qt5 related pathshjk2011-09-161-1/+1
| | | | | | | | | | | | | | | | This is not a final solution. Change-Id: I19e7a99e1b056704864d27855197678a0d3fd10b Reviewed-on: http://codereview.qt-project.org/5073 Reviewed-by: hjk <qthjk@ovi.com>
* | qmake: Warn when using a mkspec that might not work with the tool chainTobias Hunger2011-09-152-5/+38
| | | | | | | | | | | | | | | | | | | | | | Warn when using a mkspec that might or might not work with the selected tool chain. Task-number: QTCREATORBUG-5854 Change-Id: Ifead5108ccd109f66707ad7aa371daead8cb57e7 Reviewed-on: http://codereview.qt-project.org/4522 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | utils, qmljstools, vcsbase: s/\bm_d\b/d/ghjk2011-09-156-47/+47
| | | | | | | | | | | | Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd Reviewed-on: http://codereview.qt-project.org/4992 Reviewed-by: hjk <qthjk@ovi.com>
* | Qt4Project: Update code models if a folder watch changes the file list.Christian Kamm2011-09-153-2/+5
| | | | | | | | | | | | | | | | Fixes: c861af529ec87b34f1ca45d917d367c345334859 Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84 Reviewed-on: http://codereview.qt-project.org/4969 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Qt4Project: Always notify the code models if the file list changed.Christian Kamm2011-09-151-3/+1
| | | | | | | | | | | | | | Change-Id: Id795a363c9f990e9506eb35ed5a398948f93cf2f Reviewed-on: http://codereview.qt-project.org/4967 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-09-1516-78/+312
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.pro share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp src/plugins/remotelinux/remotelinuxruncontrol.cpp Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
| * Symbian: QML Viewre version added to info buttonPawel Polanski2011-09-081-0/+6
| | | | | | | | | | | | Change-Id: I413232e486053950230fe131dc156990ac1d96cf Reviewed-on: http://codereview.qt-project.org/4470 Reviewed-by: Paweł Polański <jaggernod@gmail.com>
| * CODA: Fixed crash when redeployingPawel Polanski2011-09-081-0/+4
| | | | | | | | | | | | Change-Id: Id154468d6ee4db4eb045fde8a0e858ad5b17428f Reviewed-on: http://codereview.qt-project.org/4469 Reviewed-by: Paweł Polański <jaggernod@gmail.com>
| * CODA: Debug output added to CODA 4.0.23Pawel Polanski2011-09-082-30/+11
| | | | | | | | | | | | Change-Id: Idd2ea3d11a5ee193205c642cc6176ec70c6ef41a Reviewed-on: http://codereview.qt-project.org/4418 Reviewed-by: Paweł Polański <jaggernod@gmail.com>
| * MobileWizards: Add option for booster to harmattan configure pageKai Koehne2011-09-0110-44/+285
| | | | | | | | | | | | | | | | | | | | | | Split up maemo- and harmattan wizard pages, and add a checkbox for enabling booster specifically for harmattan. Change-Id: If5653abbf6d29b5f946718d10bc12404df19c16c Reviewed-on: http://codereview.qt.nokia.com/3731 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
| * QtQuickApp: Tweak template to enable Meego boosterKai Koehne2011-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the meego booster. This requires - Telling qmake to link to right libraries - Exporting main method - using QApplication, QDeclarativeView objects from cache - avoiding QCoreApplication::applicationDirPath() To keep compatibility, QmlApplicationViewer is still derived from QDeclarativeView. However, if the app booster is used it merely acts as a proxy to the view from the cache. Change-Id: I83e285d9ca3c2cfd86d1711e1fb93c72589ba14d Reviewed-on: http://codereview.qt.nokia.com/3730 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
View Lorry Controller Status