aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Perforce: Fix compilev3.3.0-rc1Christian Stenger2014-11-251-1/+1
| | | | | Change-Id: Ief5ba86354a9c657fc9676bf6693fe4a11f543c5 Reviewed-by: hjk <hjk121@nokiamail.com>
* qmljs: cleanupFawzi Mohamed2014-11-251-6/+4
| | | | | | Change-Id: I951403ecec2b896e5b0322d79dfad952deeaae4a Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* Debugger: Require some clang version for clang specific testhjk2014-11-251-4/+4
| | | | | Change-Id: Ib6ba0ffb5957a60e700abd9a540bd7bbf5888b2a Reviewed-by: hjk <hjk121@nokiamail.com>
* Perforce: Don't crash on large log outputhjk2014-11-251-1/+9
| | | | | | Change-Id: I3766d20f5faaa01f38418cdfdcc4977cf9189fc7 Reviewed-by: Cristian Adam <cristian.adam@here.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Revert "ToolChains: Do not list ToolChains removed by the sdktool"Eike Ziller2014-11-251-11/+9
| | | | | | | | Obviously the patch removes too much. This reverts commit 9a5f81d96fd81dfeec9edd47c73f74498bc1b897. Change-Id: Id6f128a8d72b51d0d1701a0a82377b56e2a314b2 Reviewed-by: hjk <hjk121@nokiamail.com>
* Android: Fix name for api level 20Daniel Teske2014-11-251-0/+1
| | | | | Change-Id: I21ec1294c090966b59d556992f45b5be4615cb20 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Extending Doc: Add warning about what the Qt Creator plugin wizard createsEike Ziller2014-11-251-0/+6
| | | | | | | | | Because we do not guarantee any source or binary compatibility, you should use the Qt Creator version that you want to develop for to create the plugin Change-Id: I747653f8bbd3df9cc82af7fac67abcf14e786241 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: update info about other build systems than qmakeLeena Miettinen2014-11-252-2/+5
| | | | | Change-Id: Ie836c97bd6b87e9122b5d9f7be1f078ebbca4d8b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* qmljs: avoid storing qmltypes and qmlprojectFawzi Mohamed2014-11-251-0/+2
| | | | | | | | | | qmltypes files were stored in the snapshot during scan, this is wrong and bloats the memory usage. Task-number: QTCREATORBUG-13369 Change-Id: Ie8c3970ad7a8d732230f3dc73a9ba65ab62ea4e9 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* Ssh: Remove wrong Q_ASSERT in SshRemoteProcess destructorhjk2014-11-251-3/+1
| | | | | | | | | This can be triggered rather quickly by clicking "Run" for a short- lived application on a QNX device. The state in this situation is QSsh::Internal::AbstractSshChannel::SessionRequested. Change-Id: I4447b85a4e8d6ba63e30f3783d29bb0c816e0dff Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Doc: Improve description of "Qt mkspec" fieldKai Koehne2014-11-251-2/+3
| | | | | | | | | | | The mkspec is a global configuration for qmake, not a 'build instruction'. For people new to qmake, and build systems in general, it might be arguably a bit hard to grasp what an mkspec is (the qmake documentation doesn't explain it apparently, either). Still, this is probably not the right place to go much more into details ... Change-Id: I80aa5fb9e4751242dd2570613951f2e1387c4433 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* ElfReader: Catch bad_alloc exceptionOrgad Shaneh2014-11-251-1/+7
| | | | | | | Might happen on file.readAll() for large elf files. Change-Id: Id338e647d2d0903d2071b5f35ffc7a00e6aca24d Reviewed-by: hjk <hjk121@nokiamail.com>
* ToolChains: Do not list ToolChains removed by the sdktoolTobias Hunger2014-11-241-9/+11
| | | | | | | | | Remove ToolChains removed by the sdktool from user settings. This prevents them from being created again. Task-number: QTCREATORBUG-12751 Change-Id: I61b77acb6ab12815d3b09bd766ba44301c517aed Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Utils: Fix memory leak in JsonMemoryPoolOrgad Shaneh2014-11-241-1/+3
| | | | | | | | | | objects are freed, but their dtors are not called... Detected by valgrind Change-Id: Iec8d78c205e9b2722ee5a89941df96c3383b385b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* Doc: Prepare Qt Creator manual for the qt.io online styleTopi Reinio2014-11-242-0/+34
| | | | | | | | | - Add a copyright notice (required for projects external to Qt in the new template) - Add an .html file with sidebar content Change-Id: I2c9d965698aa2d2ed01426510b16916ed4fef8cf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* CppTools: Remove QTC_ASSERTNikolai Kosjar2014-11-241-2/+2
| | | | | | | | A DiffEditorDocument has an empty file path. Change-Id: If097497514afa82b1ed220a37cae410f4a81aa9a Task-number: QTCREATORBUG-13489 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Valgrind: Fix memory leakOrgad Shaneh2014-11-241-2/+5
| | | | | | | | Detected by valgrind :) Change-Id: I4e6b9cb1980cce82170e3f6c2e7cb541dd838d5e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* ProjectExplorer: Fix disabled "Close Project" after closing projectDaniel Teske2014-11-241-2/+3
| | | | | | | | | | | | | | The close project action is special. If there are multiple projects open we show a menu with individual actions per project. If only one project is open, we show one the "m_unloadAction". Even with only one project open, the current project might be null. So explicitly manage enabled the same way as visible. And also us the displayName of the startup project, since that is guranteed to be non-null if there's a project open. Task-number: QTCREATORBUG-13497 Change-Id: I9150568da162c58ee524c2b954e0b9a816f79d7c Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* SettingsDialog: Fix default buttonDaniel Teske2014-11-241-1/+3
| | | | | | | | | | | | | The default button would move to the first pushbutton that got focus. E.g. tabbing through the android settings would move the default button to the first button that got focus. The cause of that is that for QPushButton::setDefault to work, the button needs to be a child of the QDialog. So call it after adding the buttongroup to the layout. Change-Id: Ife35bf15aa8585f7931a87ee715f316bb02b36be Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Doc: remove support for building docs with Qt 4Leena Miettinen2014-11-2470-4047/+26
| | | | | | | | | The templates are fetched from qtbase/doc/global Change-Id: I15386a66e1dae552f5637062d9f176bf6565a834 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* OS X: Add background image to installer and update imagesEike Ziller2014-11-243-1/+1
| | | | | | | | | "Watermark" is not available on OS X We have a new logo now Task-number: QTCREATORBUG-13482 Change-Id: I01fdfb958bc67660a87a2c5a18f88613e7121aff Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Android: Fix deployment of release builds with Qt 5.3 and earlierEskil Abrahamsen Blomfeldt2014-11-241-11/+5
| | | | | | | | | | | | | | Since unsigned packages are not deployable, we always make packages signed with the debug key when there's no signing requested, even if the native code is built as release. This was already fixed for Qt 5.4, where we use androiddeployqt to deploy the apk, but for earlier versions, we need to use the correct apk name. We also need to use the apk name which is used by androiddeployqt in Qt 5.3, which does not contain the "-signed" suffix. Change-Id: I87f7936002946acd80bc245935c44cf148f9630d Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* ProjectExplorer: Compile fix after 78f1b24chjk2014-11-211-0/+10
| | | | | Change-Id: I6e106d4ae20b0c26acbb1f2257c59dea0498f623 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* JsonWizard: Add separate method to get stringified valuesTobias Hunger2014-11-216-31/+38
| | | | | | | | | | | | | Have value(...) return a QVariant that is never mangeled and add a stringValue(...) method to retrieve stringified values. It is way easier to see who needs what now. Use this consistently in the JsonWizard and fix one place where a QVariant was expected but a stringified version was returned. Task-number: QTCREATORBUG-13486 Change-Id: I2c4e9188280940e529f0f60bcc18b9b7330865d1 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* JsonKitsPage: Clarify unexpanded/expanded project pathTobias Hunger2014-11-213-7/+6
| | | | | Change-Id: I62a04582d29b122f6210b3bcef0d3e5e26d5286e Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Android Settings Dialog: Fix tab orderDaniel Teske2014-11-211-213/+213
| | | | | | Task-number: QTCREATORBUG-13484 Change-Id: I1d63ceb485a0bde87010f86dce540c4c37da8b48 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Debugger: Adjust std::vector<bool> dumper autotest for recent Clanghjk2014-11-211-6/+9
| | | | | Change-Id: I1998f0750c5905a3dc4e83db297edc135cd2a39a Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Add ability to check for clang version in testshjk2014-11-211-7/+54
| | | | | Change-Id: Ie56de7a0e59cadd8557f7a2fd00d434470000f3c Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Core: Fix memory leakOrgad Shaneh2014-11-212-5/+4
| | | | | | | Detected by valgrind Change-Id: Iae3845edfcf1933c90b6b20b6af3909324ceb6fe Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* BaseQtVersion: Rename isInSourceDirectory to isSubProject and fix itDaniel Teske2014-11-214-10/+21
| | | | | | | | | | The source and examples directory is not a sub directory of the qt source directory in the sdks. But we still want to treat it as part of a the matching qt. Task-number: QTCREATORBUG-13469 Change-Id: Ib63722052a14c29e4198c879dd770fb4ecdcdb80 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* SVN: Fix checkout wizardTobias Hunger2014-11-212-2/+1
| | | | | | | | Task-number: QTCREATORBUG-13457 Change-Id: Ib328678de18e1ae7160aaa1035356a62413b2efb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Doc: update accelbubble example source fileLeena Miettinen2014-11-212-1/+7
| | | | | | | | To reflect changes in the template. Hide license header from the docs. Change-Id: Ib703f5a8c17ef210a14c684caa8ba9ecf8936839 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Doc: replace Text type with Label typeLeena Miettinen2014-11-211-1/+1
| | | | | | | Because the templates were changed. Change-Id: Ib64f65d1735604ad0c54addc2c7d1ce850ca08a8 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QbsPM: Fix memory leaksOrgad Shaneh2014-11-216-0/+18
| | | | | | | Detected by valgrind Change-Id: I32008cb91b5b814f67896ad1efb08f1366a38c76 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Doc: remove built-in from theme namesLeena Miettinen2014-11-211-2/+2
| | | | | | | | The string was hidden in the UI. This needs to come back when the condition changes again. Change-Id: I096fdbe0ff15f9dbaa7fb04a0dbb6271fab87315 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* PluginManager: Fix potential leakOrgad Shaneh2014-11-211-1/+3
| | | | | | | Detected by valgrind Change-Id: Id8de8e8f5e3f4e691be818ff0224676345227156 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QmlProfiler: use correct row heights for binding loop markersUlf Hermann2014-11-211-4/+4
| | | | | | Change-Id: Id476d9be7c0b1a4fb7c8e5fffb2861441d369316 Task-number: QTCREATORBUG-13451 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* QmlProfiler: Fix memory leakOrgad Shaneh2014-11-211-1/+3
| | | | | | | Detected by valgrind Change-Id: I505e8dec83a0c9d3be648e43d9886debeb2a5b3b Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Theming: Do not append (built-in) to themesOrgad Shaneh2014-11-211-1/+1
| | | | | | | In 3.3 only built-in themes are supported... Change-Id: I7236c799c0f44059e808b160b8cc7519769f9470 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Resource editor: Fix paste.Friedemann Kleint2014-11-208-11/+34
| | | | | | | | | | Add a "plainText" property to the resource editor's document similar to the diff editor (see f268d0f8e14dd10e05180b4bc195fff036b5ba33 ). Task-number: QTCREATORBUG-13458 Change-Id: Icd11134432f796b37090a16bbaa13f075fa8c2bd Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* FormWizard: Fix newlines being escaped in generated outputTobias Hunger2014-11-204-5/+11
| | | | | | | | | | | | | | | Export the form contents as a list of lines and join them when needed instead of hoping to unescape '\\n' in all places where it is necessary. This approach should be a bit saver since it will cause parse errors in the wizard, which are more visible than broken output in the generated files. Task-number: QTCREATORBUG-13456 Change-Id: I434a9227082f92be3c2ce75006f61ac79a2b6fd6 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QmlProfiler: Center the binding loop marker on events in overviewUlf Hermann2014-11-201-1/+1
| | | | | | Change-Id: If16ee4335b40e6ee611f04032246620ecf29f2db Task-number: QTCREATORBUG-13453 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Android: Don't default to gradleDaniel Teske2014-11-201-2/+2
| | | | | | | | | There are numerous problems with gradle, so for now switch the default to off. Task-number: QTCREATORBUG-13470 Change-Id: I9d2fc216c91656a528875a0bc3b820d4f289b9b0 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Doc: Paste Clipboard command was removedLeena Miettinen2014-11-201-1/+1
| | | | | | | The Paste Snippet command can be used instead. Change-Id: I96dd2628f000a11741fd52e291bc2b2e6a51f6a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Fix license headersKai Koehne2014-11-207-37/+42
| | | | | | Change-Id: I810aa2d98c96040fd536ae0711041f301e5c22d7 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* CMake: Add logging output to file -> target mappingDaniel Teske2014-11-201-1/+25
| | | | | | | | | | | The logic for mapping files to targets is a heuristic, and a pretty bad one. Add some logging output, which can be enabled by setting the env variable QT_LOGGING_RULES to qtc.cmakeprojectmanager.filetargetmapping.debug=true . This will allow easier debugging of problematic cases. Change-Id: I17086a30beb8962333109fce9198edde4540d169 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CMake: Further fine tune file -> target mappingDaniel Teske2014-11-201-6/+15
| | | | | | | | | | | | Instead of requiring that the target's source directory is a parent of all source files, use a distance between the source and directory and the file. This will find the wrong CMakeLists.txt in more cases but also is much more likely to lead to using the fallback target. This makes code completion work for http://github.com/dream3d/dream3d/ Change-Id: Ic035454c5eabe361bc7c46bd943e9a9cdee730e3 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CMake: Fine tune finding a suitable targets for filesDaniel Teske2014-11-201-0/+4
| | | | | | | | Ignore targets that have no include directories, those are in general not targets that are very useful. Change-Id: I1cd1f7dffc73eace2f7a0897bc15dea7e6bc5fee Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Theming: Hide the buttons in the theme selectorOrgad Shaneh2014-11-202-9/+27
| | | | | | | They are not supported in 3.3. Change-Id: Iecd52e4273b9b9f5855df37e28739135f1725a2b Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* QtKitInformation: Report correct version IdTobias Hunger2014-11-201-1/+2
| | | | | | | | We try hard to find the correct version, but then forget to report that back before continuing to find a weaker match. Change-Id: I824194fe4d13db04eba488268165b27c033d33bf Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>