aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Debugger: Do not try to load unreadable extra dumpers fileOrgad Shaneh2015-06-222-2/+2
| | | | | | | | | | | | | | It aborts the debugger. Change-Id: Ia926825f658b492fa7ac738a79027186c9dd7386 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Squish: Update suite_SCOMRobert Loehning2015-06-193-14/+10
| | | | | | | | | | Change-Id: I341efe4dc6440f8d8773a27a3dcc754c1151241c Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Squish: Update tst_git_cloneRobert Loehning2015-06-192-15/+10
| | | | | | | | | | Change-Id: I5af8398893ac89f56245d67978ca4c1df6fce009 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Core: Make Id(int) constructor less accessiblehjk2015-06-193-3/+6
| | | | | | | | | | | | | | | | | | | | ... and change two seemingly accidental uses. The functionality is still available by explicitly using Id::fromUniqueIdentifier(). Change-Id: I190e58f9fcd5c0f06e29103a0c0c82e322bee100 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Analyzer: Remove one level of indirection when creating RunControlshjk2015-06-193-18/+6
| | | | | | | | | | Change-Id: I7029e2dbd3352549036da642fdbd926756a563cb Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Core: Remove unused Id::registerIdhjk2015-06-192-17/+0
| | | | | | | | | | | | | | | | This was intended to avoid the char * -> int mapping at all, but was never actively used. Change-Id: Ief119cc2ff2c8b4ed404c9eb534e17265a3562e6 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | QmlDesigner: avoid uninitialized warningNikita Baryshnikov2015-06-191-4/+6
| | | | | | | | | | Change-Id: I88d3da3030b5a2b71b3d807ba9482e2e0e656b37 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | Valgrind: Remove one use of AnalyzerStartParameters::useStartupProjecthjk2015-06-191-1/+0
| | | | | | | | | | | | | | | | | | That information is now passed directly to the RunControl after its construction (and is still wrongly used afterwards to distinguish local from remote runs) Change-Id: Ifa21eea9f33b2602912cd3b1b2e884da4f53c0d9 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Analyzer: Remove AnalyzerStartParameter::useStartupProjecthjk2015-06-193-12/+4
| | | | | | | | | | | | | | Not used anymore. Change-Id: I97da63a3bfabbdcf5ccbd36178832ea47d913d04 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Squish: Remove compatibility code for Qt 5.3Robert Loehning2015-06-193-16/+6
| | | | | | | | | | | | | | Creator 3.5 needs Qt 5.4 at least. Change-Id: Ie37447ff612cc7294cbd8dcca17e81997e4f9328 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Valgrind: Start custom actions more directlyhjk2015-06-197-29/+43
| | | | | | | | | | | | | | This does not need to go through the PE machinery. Change-Id: If0b2fde5309d7e119e8ac27245a22939b68d847d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | TextEditor: Remove unused variable.David Schulz2015-06-191-1/+0
| | | | | | | | | | Change-Id: I7bb08e9ded88013fd8ca3b99fadf9e3c091feb38 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | SSH: Fix wrongly emitted assert.Christian Kandeler2015-06-181-1/+2
| | | | | | | | | | Change-Id: Ib19030ccbf708a7ad738df89f3fc0a45b0052bb9 Reviewed-by: hjk <hjk@theqtcompany.com>
* | Analyzer: Merge AnalyzerAction::useStartupProject and ::toolStarterhjk2015-06-184-19/+21
| | | | | | | | | | | | | | | | Also rename ToolStarter to CustomToolStarter to make clearer that this is not the normal startupProject based setup. Change-Id: I6c538eed9280e0c02912954541423f030e88585f Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Doc: ReformatTobias Hunger2015-06-181-6/+7
| | | | | | | | | | | | | | | | Make \uicontrol usage more consistent with elsewhere, but no text changes besides that Change-Id: I8bb6cd73e7270310898ba0ba50e0372b0d6c6f9b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | QmlProfiler: Drop redundant checks for useStartupProjectUlf Hermann2015-06-181-6/+0
| | | | | | | | | | | | | | | | | | Those were misusing the flag to distinguish between local and remote startup and that was unnecessary as the LocalQmlProfilerRunner is only instantiated for local startup anyway. Change-Id: I030931c9db9e8482199e4fbd04665a6c973b67f8 Reviewed-by: hjk <hjk@theqtcompany.com>
* | Analyzer: Add prepare step to tool starting.Ulf Hermann2015-06-185-18/+19
| | | | | | | | | | | | | | | | The toolPreparer can do a last minute check and stop the execution of the actual tool. The QML profiler uses this to check for unsaved notes. Change-Id: I5185430f50ffb01e9854cafa442f0eaaad27fa5d Reviewed-by: hjk <hjk@theqtcompany.com>
* | SubversionPlugin: Introduce member initialization.Jarek Kobus2015-06-183-59/+31
| | | | | | | | | | Change-Id: Ib242ebdadf858cf64dbce8799699f024d7368204 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Valgrind: Reshuffle plugin setuphjk2015-06-182-43/+23
| | | | | | | | | | | | | | Straighter code. Change-Id: Iab8b85dd1442bbdcd0b2db0052de927f4463aeb1 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | FakeVimPlugin: Introduce member initialization.Jarek Kobus2015-06-183-124/+72
| | | | | | | | | | Change-Id: I0e09933ededd48133662a65da701c228e6c08419 Reviewed-by: hjk <hjk@theqtcompany.com>
* | CvsPlugin: Introduce member initialization.Jarek Kobus2015-06-182-66/+31
| | | | | | | | | | Change-Id: Ia47961240643944b33a1d00deef4c812b26e4d82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | QmlProfiler: Always try to connect immediately if we know the portUlf Hermann2015-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Waiting for the debug output is not necessary in most cases because we tell the application which port to listen on anyway. QmlProfilerClientManager will retry 50 times and then prompt the user to decide if even more tries are necessary. This should be enough to establish a connection. As a side effect, this removes the only place where AnalyzerStartParameters::startMode is used in the QML profiler. Change-Id: I40991b34c98d93b0874d627fba3dae7ccfabaf2c Task-number: QTCREATORBUG-13510 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | QmlProfiler: Remove some dead code.Ulf Hermann2015-06-181-4/+1
| | | | | | | | | | Change-Id: I21f26bd40b78d760e72a6cc135a06a368c31eaf2 Reviewed-by: hjk <hjk@theqtcompany.com>
* | Analyzer: Move tool startup code closer to the action setuphjk2015-06-188-100/+58
| | | | | | | | | | | | | | | | | | The code sharing in the base was along a somewhat unfortunate boundary. Moving it into the only user also removes some of the wrong local/remote separation. Change-Id: I0be9636ea448d123f9f5105a52d56f47ff7871c3 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | ClangBackEnd: Fix another operator<Orgad Shaneh2015-06-181-1/+3
| | | | | | | | | | | | | | Missed in 2fc604e699f6898cbfe4f516df4696b8a60f247b Change-Id: I520cff39f806213b92f5f49bd8d22153ecdfe62b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | CppEditor: Add a missing includeOrgad Shaneh2015-06-181-0/+1
| | | | | | | | | | Change-Id: Ie97904b6a896dd8b8e327fe3d00611d91a974dd2 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Properly delete plugins dependent on failed pluginJarek Kobus2015-06-1710-38/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init all class member pointers to NULL. This fixes possible crash on exit when dependent plugin was not loaded (e.g. TextEditor was missing). In this case plugin's constructor gets called, initialize() method is _not_ called and destructor gets called -> crash. Properly delete dependent plugins on a plugin which failed to initialize properly. Fix labels of deleted plugins inside an error dialog after pressing "Error Details" from "Installed Plugins" dialog. Change-Id: Iddc029a0f07dcba2501d734d142fb0e69e9383d3 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Clang: Use qtcreatortool.pri in clangbackend.proNikolai Kosjar2015-06-172-30/+18
| | | | | | | | | | Change-Id: Ia33e7265e103aed04d18b23ae8d02d4e403aae8b Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* | CPaster: Introduce override.Friedemann Kleint2015-06-1710-60/+60
| | | | | | | | | | Change-Id: I0c002895a6585fac79c8aa1d773b68c4a1540916 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | CppTools: Fix misdetection of virtual function overloadsOrgad Shaneh2015-06-172-0/+31
| | | | | | | | | | Change-Id: I4231d0b98fef2f2f3f1ebdf74c7dfc48ec879e83 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | CPaster: Introduce member initialization.Friedemann Kleint2015-06-1716-72/+27
| | | | | | | | | | | | | | Remove/simplify constructors accordingly. Change-Id: I27ac0281a89dfadefb1f7837d99ce185745b7aae Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | CppEditor: Offer to insert "override" for InsertVirtualMethodsNikolai Kosjar2015-06-171-26/+209
| | | | | | | | | | Change-Id: Iade2bcb1aa18053954df9063ca08d18d032fdfd1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | JsonWizards: Only show wizards with Qt versions that support themTobias Hunger2015-06-172-8/+14
| | | | | | | | | | | | Task-number: QTCREATORBUG-14216 Change-Id: I7e9e760f7ba9ef6022e76f1600e473a5f54c9893 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | JsonWizard: Make minimum Qt version workTobias Hunger2015-06-172-4/+21
| | | | | | | | | | | | Task-number: QTCREATORBUG-14487 Change-Id: Ic858b131abb2802cb7bfedf58f64c644ea2085e5 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | JsonWizard: Explicitly set required/preferred features on kits pageTobias Hunger2015-06-173-5/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the required/preferred features from the wizard in the kits page. The wizard's features are used to decide which wizards will be shown (together with the enabled key). The kits page has a separate set of features that are used to decide on the Kits shown. Keep these settings separate, as they are different things. If nothing is set at the Kits page, then the wizard's values will be copied. This is to stay compatible with existing JSON wizards. Change-Id: I2f8e3ccc46ce92f5be89aecaf52e5a81e4b29e83 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | CppEditor: Extract reading/writing settings for InsertVirtualMethodsDialogNikolai Kosjar2015-06-171-43/+60
| | | | | | | | | | | | | | We will add some more settings. Change-Id: Ib0282a9e7a9aa4ec316db7aded804e5483e48e48 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | QtVersion: Add features for major/minor/patchlevel of Qt versionTobias Hunger2015-06-173-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | This is more fine-grained than the "Qt4" or "Qt5" we used to support and will allow for wizards to specify things like "Make sure we get a Qt version > 5.x" for the kit selection page. That page is provided by the ProjectExplorer, so we can not access the Qt version there, so Features seem the only possible way to go. Change-Id: I0f4b3a0b5be91fb331924a560414e8f73bccca41 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-06-1723-49/+72
|\| | | | | | | Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
| * Squish: Remove outdated kit handling codeRobert Loehning2015-06-164-33/+5
| | | | | | | | | | Change-Id: I69f1b6d0d27e9330ff23de0b9d5a09ef02f353ac Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| * Version bumpEike Ziller2015-06-162-2/+2
| | | | | | | | | | Change-Id: I4a9cde2300b1cc14feadaa6240fefebc57fd0e19 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * support Visual Studio 2015Joerg Bornemann2015-06-157-8/+33
| | | | | | | | | | | | Task-number: QTBUG-46344 Change-Id: I49c3e2776e65cc83d40d1f5ab3be1365d17242d1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Valgrind: Fix possible crashesChristian Stenger2015-06-152-6/+4
| | | | | | | | | | Change-Id: Ifae94d68d6c83f65a1938bfe41b4c5932407c0cf Reviewed-by: hjk <hjk@theqtcompany.com>
| * Fix typo in French translationRobert Loehning2015-06-101-1/+1
| | | | | | | | | | | | Change-Id: I1eda15d0ea1abcd2f160a11d06e8a89d72ffa1f7 Task-number: QTCREATORBUG-14561 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * Fix OpenGL on Linux with Qt 5.5Eike Ziller2015-06-051-1/+1
| | | | | | | | | | | | | | The XCB platform plugin now needs a plugin for the OpenGL backend Change-Id: I5e7b296a0b645aec2a8d3ba80c53cb946e35e7f1 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Update qbs submodule.Christian Kandeler2015-06-041-0/+0
| | | | | | | | | | | | | | To HEAD of 1.4 branch. Fixes OSX build. Change-Id: I5ea2756d0764e54b41bcbd2dff5e8083af31e768 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Adapt to qbs' libexec infrastructure.Christian Kandeler2015-06-036-0/+26
| | | | | | | | | | Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Update qbs submodule.Christian Kandeler2015-06-031-0/+0
| | | | | | | | | | | | | | To HEAD of 1.4 branch. Change-Id: I6eb26ac7ef151a71021effad1fb4168135fd9352 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix parsing of old settings with sdktoolKai Koehne2015-06-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | With commit 5aba7fb09504e1a the sdktool started to save id's in a QString (instead of a QByteArray). Commit b2e3f0262bbf5de4 then adapted also the parsing. However, this broke the parsing of existing settings still using a QByteArray. Task-number: QTCREATORBUG-14545 Change-Id: I6c991d9d130602c7e9b3146b4d7b17555056a8ef Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Analyzer: Replace StartMode with a useStartupProject booleanhjk2015-06-1720-61/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | This is what it is on the top level. The change makes it obvious that in the valgrind(-derived) plugins the value is later wrongly used to make a decision on whether to run the valgrind process locally or remotely. But that's isolated in valgrind now and can be fixed there. Change-Id: I6fa5e669dec1f9e2cdebe42a1591d15144082a21 Reviewed-by: Anton Kreuzkamp <anton.kreuzkamp@kdab.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | sqlite: Disable warnings also for qbs build.Christian Kandeler2015-06-171-0/+1
| | | | | | | | | | Change-Id: I101fe0abb98ed2d08970b5cf0f9de803a3137e8c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>