summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Checkout correct branch of the binary-artifacts repository.2.7David Schulz2013-06-282-1/+2
| | | | | Change-Id: I66e27b54b59874f5f69958cf9e178a5ce1b2da97 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* AndroidPackageCreationStep: Ensure right thread for handleOutput()v2.7.2tqtc/v2.7.2Daniel Teske2013-06-271-2/+2
| | | | | | | | | | | The ::run method is run in a separate thread, yet the owner of the buildstep is the gui thread. As such we need to use a DirectConnection to ensure that the slot is called in the right thread. Task-number: QTCREATORBUG-9660 Change-Id: Ia206f3256a23f70f50d31c739359ff24b952fe46 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QmlProfiler: Avoid idle engine cancelling other engine's processKai Koehne2013-06-261-0/+4
| | | | | | | | Task-number: QTCREATORBUG-9643 Change-Id: Ia0a2427a186fd9ad24e1cf620df48be13032a69b Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Qnx: add a dependency to the debugger pluginEl Mehdi Fekari2013-06-253-0/+3
| | | | | | | | | This is already done in Master and 2.8 branches. Task-number: QTCREATORBUG-9455 Change-Id: I8ae9e5a14ba561640d3389e08cb74a5ec856d335 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qnx: Fix tag for splashscreensEl Mehdi Fekari2013-06-251-1/+1
| | | | | | | | | | Task-number: QTCREATORBUG-9626 Task-number: QTCREATORBUG-9083 Cherry-picked: 4ff03aa71a7122d4573d4dc270a0847818842054 Change-Id: I69915d9da91cde39b1bc32f150c30a5e97cba157 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* process_stub_unix: fix race condition with reading of env fileFawzi Mohamed2013-06-251-2/+2
| | | | | | | | | | The stub incorrectly send its pid before reading the environment file, and qtcreator does interpret that as sign that it can delete the environment file. Task-number: QTCREATORBUG-9024 Change-Id: Id44777abdfdd94aa10815cb00ca27846b95a3ec7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* C++: Handle recursive using/typedef declarationsNikolai Kosjar2013-06-254-4/+155
| | | | | | | | | Remember using/typedef declarations we have already looked up and stop if we try it again. Change-Id: I91bf0aef4df18539a47d015f0113543aef1f692a Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> (cherry picked from commit 50a900e509be2e1f448f29be126ba3b7f8173901)
* C++: Handle recursive auto declarationsNikolai Kosjar2013-06-256-10/+82
| | | | | | | | | | | | Remember auto declarations we have already looked up and stop if we try it again. Task-number: QTCREATORBUG-9503 Change-Id: I989b11609c98bf197ce916d79c9d452294355053 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> (cherry picked from commit 8f1b6656677344e9ca4b6798ddd900725c478b16)
* Fix broken list requests in CodePaster.Friedemann Kleint2013-06-212-4/+19
| | | | | | | | | | | Pastebin.com-support: Remove header from list data. KDE Paste: Add trailing slash to prevent redirection. Task-number: QTCREATORBUG-9547 Change-Id: If47c4bc64767efb6f1a17db22ff9e0dbee3841bc Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner: use correct icon for vertical sliderThomas Hartmann2013-06-181-2/+2
| | | | | | | | Task-number: QTCREATORBUG-9558 Change-Id: Ib06006ea986eea307bfb6fc3289dce7468de0b48 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* AndroidRunner: Fix CheckPidTimer to not fire foreverDaniel Teske2013-06-181-2/+7
| | | | | | | | | | | - Only start the timer after we are sure that the app is running. - Stop the timer if we detect that the app was closed. Task-number: QTCREATORBUG-9545 Change-Id: I7d08b759d3aa5baaa3f82ee09aefb17e7c5fb512 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: rename index.html as extending-index.htmlLeena Miettinen2013-06-146-6/+1
| | | | | | | | | | Remove the \contextpage commands, as they are only used in some of the files. Task-number: QTBUG-31106 Change-Id: Iacbf15a33ab6cb426c2fbfb6fbed03310095f2ba Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Android: Autodetect a value for OpenJDK pathDaniel Teske2013-06-141-1/+52
| | | | | | | | | | | First look into the current PATH, secondly into the registry. Change-Id: I3b1d1ebccb1a85c03979ac3d48740c3de5a6df40 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Android: Set JAVA_HOME in environment and use that environmentDaniel Teske2013-06-144-1/+12
| | | | | | Change-Id: Ia0f3abad74b7ac423fab621ca22e0f698747c477 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
* Android: Show complete output of ant runDaniel Teske2013-06-112-10/+19
| | | | | Change-Id: I4964e5bf22a715375a7fa080604d16692c956fc2 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android: Use '/' in INSTALL_ROOT if sh.exe is in PATHDaniel Teske2013-06-101-1/+14
| | | | | | | | Task-number: QTBUG-31147 Change-Id: Ifdeef2fa96668fdb482fd613eb8766c1ff5e3afd Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove semi-colon at end of line in project fileJonathan Liu2013-06-061-1/+1
| | | | | | | | Having a semi-colon at the end of line results in a parse error when processed with qmake. Change-Id: I9acfe5a7fc5a5db1c802cb70653789cc7edca5e3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QmlProfiler: fix potential crashChristiaan Janssen2013-06-053-3/+7
| | | | | | | | fixes Ib2ea66bd5694046577a0b5a0e2f611f3ffba0238 Change-Id: Ib7a4e02391513984f1c81a43a5fab490b7f88923 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix translation file / buildEike Ziller2013-06-051-1/+1
| | | | | Change-Id: I6b48de43028b75a1e477d90334fecb2e7bf30835 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix path error in Chinese translationsYou-Ruei Tzeng2013-06-042-16/+16
| | | | | | | Done-with: Liang Qi <liang.qi@digia.com> Change-Id: I5bfe56344497b950951bc5f038ce6868abb2f41a Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove the locations in zh_TW translation fileLiang Qi2013-06-041-7300/+0
| | | | | Change-Id: Id1b330283a5f6e32300df3dbb2081fd287a2c752 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: fixed updating Java files on Windows.Yoann Lopes2013-06-041-4/+5
| | | | | | | | | | When looking for lines in Java files that are not supported by the selected API level, it didn't take into account that line endings are "\r\n" on Windows. toInt() was failing, trying to convert for example "10\r" to an integer. Change-Id: I35478abd40d5ce4621d2320b3a5f5a3514cf9591 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QmlConsole: Fix bug: Jump to location in editorAurindam Jana2013-06-042-2/+14
| | | | | | | | | Since the file path starts with file:/// use QUrl to get local file name. Task-number: QTCREATORBUG-9337 Change-Id: Icf591fdcab8cb626cfbf844c451a2c87c07b853a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProfiler: fix dangling pointer in EngineChristiaan Janssen2013-06-041-1/+3
| | | | | | | Task-number: QTCREATORBUG-9391 Change-Id: Ib2ea66bd5694046577a0b5a0e2f611f3ffba0238 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Android: Save MakeExtraSearchDirectory in settingsTobias Hunger2013-06-041-0/+3
| | | | | | | | This will keep the setting from vanishing after the first time creator is run. Change-Id: Ie3f99cfbe37fc5c242e5388a87edf3f0bdc08a30 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorerSettings: Keep environmentId.Tobias Hunger2013-06-034-1/+8
| | | | | | | | | | Make sure to not change the environmentId when editing something in the settings page. Task-number: QTCREATORBUG-9359 Change-Id: I7fc891cb3a69f08b1c2ea3f963a2deb01ddca9b2 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorerSettingsPage: Do not have a const setter.Tobias Hunger2013-06-032-2/+2
| | | | | | Change-Id: Ic0a71ce49b9f65894860562b8414772cd839152c Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Qnx: Fix slog2er parsing when logs contain \nEl Mehdi Fekari2013-06-032-13/+30
| | | | | | | | | | | If the logs contain a '\n' the message parts in the new lines are not displayed. The new line messages are displayed with no buffer details and are ignored when the parsing is processed. Cherry-picked: a7fa0dd4b9c113dda6c94b9bd27990424a91c81c Change-Id: I0e174dd5283a64c4e9b0434c06dd417f1be2c810 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix qbs build.Christian Kandeler2013-05-302-3/+0
| | | | | | | Referring to non-existing files causes an error now. Change-Id: I51aed8dfdcc92779158b284b849a34f259997e7c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qbs: Update to new way of Qbs announcing warningsTobias Hunger2013-05-296-13/+28
| | | | | Change-Id: Ie707a24d5a081c058f838410c1223201ca4021b3 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix getBundleInformation call.BogDan Vatra2013-05-291-1/+1
| | | | | | | | getBundleInformation must be called synchronously Change-Id: Iebe00295e1ef0679fdd6f9b849672d72f5ea998a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Remove duplicate module dependencies from qbs files.Christian Kandeler2013-05-2745-50/+0
| | | | | | | These cause a warning now. Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add missing QtQuick.Controls/Dialogs/Layouts type descriptionsJ-P Nurmi2013-05-271-0/+3
| | | | | | | | | | Task-number: QTBUG-31012 Change-Id: Ic19cc79faaa71a09724445cf961ec16cf16fcbb4 (cherry picked from commit 4dd4bff88601f8092562dfe2082ead360cad90e0) Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Ukrainian translation updateVictor Ostashevsky2013-05-271-1508/+4309
| | | | | Change-Id: I8c9bb5bfaac4296fb9089fb3c1e87df2b55afa9e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Debugger: Fix passing connection when starting from commandlinehjk2013-05-271-1/+3
| | | | | | | | | | | This fixes a regression when starting debugging from the command line using 'qtcreator -debug /some/binary,server="localhost:1234"'. The parameters have been parsed correctly, but were later overwritten by data from the default (desktop) "device". Change-Id: I7747eaec6479e55cc18ea21ab1233e89ee9b119a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Check start parameter languages for engine typeAurindam Jana2013-05-271-2/+2
| | | | | Change-Id: If5a05d12e7597516510d5726ca6d3418b3393251 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Android: Disable QML DebuggingAurindam Jana2013-05-271-1/+2
| | | | | | | | | | Quick fix. Do not merge into 2.8 or master Task-number: QTCREATORBUG-9342 Change-Id: Ic63d5d858321e381caf9ede7615075e4923a7b35 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlDesigner.Rewriter: bug fixThomas Hartmann2013-05-271-1/+1
| | | | | | | Do not show warnings if recovering from an error. Change-Id: I748a3f7ae63eb593ddeaa5de2ebf7264a456ac7d Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* rename ProductModule into ExportJoerg Bornemann2013-05-2717-18/+18
| | | | | | | | This fixes a bunch of warning when building with the updated qbs version. Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Debugger: Enable core dump when choosing executable after core fileOrgad Shaneh2013-05-251-0/+1
| | | | | Change-Id: I7385308c52babe8092304ffebc6c86f392c42962 Reviewed-by: hjk <hjk121@nokiamail.com>
* C++: fix crash during code completion with base template classPrzemyslaw Gorszkowski2013-05-243-1/+36
| | | | | | | | | ResolveExpression has to have a reference of ContextLookup. If not there will be a crash because of deleted instanitated base template class. Task-number: QTCREATORBUG-9329 Change-Id: I7f8c83da0d81ac6311e76d15a897adbc70b08d75 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Wizards: Adding a title to the Qt Quick Controls templateThomas Hartmann2013-05-241-0/+1
| | | | | | Task-number: QTCREATORBUG-9304 Change-Id: I9faa92bd9c1107066d7d312008a7e10613b414ff Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Update qbs submodule.Christian Kandeler2013-05-236-82/+82
| | | | | | | Plus some minor adjustments in the qbs project manager to an API change. Change-Id: I41ea8571fee7ec666344464ecc4f808bf92f13ce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QmlDesigner.Instances: custom rendering for QQuickWindowThomas Hartmann2013-05-232-1/+19
| | | | | Change-Id: Id2d9bd6b7f5cecefffddece30bb93a69699beeff Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Debugger: Issue "threadnames" command againhjk2013-05-231-1/+1
| | | | | | | Was accidentally disabled in 066efcd6a60. Change-Id: I64de0609a254aa2914142a4f75105b4140b6ae5b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner.MetaInfo: Do not limit running the parent hierarchyThomas Hartmann2013-05-231-4/+4
| | | | | Change-Id: I95ba118c8ddd7e01117f649f2ff974f2c6ee4444 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Android: Detect conditional dependencies.Christian Strømme2013-05-221-1/+7
| | | | | | | | | | | | | To solve the problem with libQt5MultimediaQuick_p we need a way to detect if an application is using both QtMultimedia and QtQuick. This change adds logic to parse the -dependencies.xml file and look for lib elements that have the extra attribute "extends". Libs with the extends attribute will only be added to the list of dependencies, if the library it extends is available. Task-number: QTCREATORBUG-9300 Change-Id: I6f3e0a6d9158a91824e1e113f6aab7ec1112dd56 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QmlDesigner: Check for QtQuick 2.1 in states editorThomas Hartmann2013-05-221-1/+2
| | | | | | | Task-number: QTCREATORBUG-9298 Change-Id: I8660e7d9614e77d23e1ef6515904941505f410dd Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Russian translation updateSergey Belyashov2013-05-221-22/+179
| | | | | | | Change-Id: I4ab239307f0c164f27fdb5e1234a9bb55c8ef7ca Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QmlDesigner.PropertyEditor: also check for HasAnchorThomas Hartmann2013-05-211-1/+2
| | | | | | | | Fixes a bug in conjunction with ApplicationWindow. Anchors did not update properly. Change-Id: I95ba118c8dde7e01117f649f2ff974f2c6ee6244 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
View Lorry Controller Status