aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* ios: simulator support for Xcode 5.13.0Fawzi Mohamed2014-03-2522-179/+1416
| | | | | | | | | | | | update iossim to be based on version 1.9.0, so that we can support the new Xcode 5.1. Keep the old version around and use it with older Xcode. All the logic has been moved into iossim which does an exec of the older binary if needed (so that creator itself remains untouched) Task-number: QTCREATORBUG-11714 Change-Id: I4ad9f922f22367c8371b3be68eae5b6dfdf4df5c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QNX: Fix QML analyzer on pure QNX targetsTobias Nätterlund2014-02-123-2/+33
| | | | | | Change-Id: Ib67b696b7938eb4de1b67b211b7f529651cdb99a Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* fix raw data leak in $$sprintf()Oswald Buddenhagen2014-02-071-1/+1
| | | | | | | | it could be only triggered by abusing the function (no expansion actually done), and nobody is using this to start with, but still ... Change-Id: I3d4a23ae4d1eea07955572d8213094e0dc218f6d Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* micro-optimization: use ProStringList::join(QChar) overloadOswald Buddenhagen2014-02-071-1/+1
| | | | | Change-Id: I25c6205df78da7fbee0ad1b04476f528f376b7a6 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QmlDesigner.StatesEditor: fix warningsThomas Hartmann2014-02-042-6/+8
| | | | | | | Task-number: QTCREATORBUG-10955 Change-Id: I6a382ed7935463c71103ca51a0a5b4822ab8cfc0 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Update qbs submodule.Christian Kandeler2014-01-271-0/+0
| | | | | | | | To the head of the 1.1 branch. Change-Id: I83af4c448c1f57f505849a6cd6a79c08f5d9b8a0 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow + for file names in file wizardEike Ziller2014-01-271-1/+1
| | | | | | | | Since some people want to use e.g. c++ as extension. Task-number: QTCREATORBUG-11266 Change-Id: I88686d814f49fcbc794c8c3427ee7251b24fa563 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Use QTC_PLUGIN_DIRS also for generating the dependencies filesKai Koehne2014-01-241-2/+20
| | | | | | | | Use the same logic as in 27563451cb6286 to resolve out-of-source plugin dependencies when generating the .pluginspec files. Change-Id: I3a62527ff381aed0e83a7c37a50da403f0a6cece Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Put "Technical Support", "Report Bug..." in a separate menu groupKai Koehne2014-01-243-17/+10
| | | | | | | This allows other plugins to add actions here. Change-Id: Id5b751bf719533842ba426ecdb4f98c43a73755b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QNX: Fixed password not being saved when using devize wizardTobias Naetterlund2014-01-241-1/+2
| | | | | | | Task-number: QTCREATORBUG-11092 Change-Id: I150218ec3dabde35e5d3e0ba95916d47743786c2 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* ProjectNameValidatingLineEdit: Fix WSTobias Hunger2014-01-231-1/+1
| | | | | Change-Id: I41b5fdee5d4f143ca68cc1c6d07cd0860fe9d810 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* QmlDesigner.PropertyEditor: Using :ICore::mainWindow() for dialogsThomas Hartmann2014-01-221-1/+3
| | | | | | | | | Since the current focus is on (native) QtQuickView window we have to specify the Qt Creator main window. Task-number: QTCREATORBUG-11322 Change-Id: I0e05efaa88b6177004730cd8c43010568cf64eac Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* RemoteLinux: Unbreak stopping processesDaniel Teske2014-01-221-1/+1
| | | | | | | | Broke in 22599094b0d72e271ba4d8bad2c1587f9ce75c69 Change-Id: Iadd96a8fb078447db66e0392585da57b9d06200e Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* ios: fix iosrunconfiguration m_arguments persistencyFawzi Mohamed2014-01-222-0/+20
| | | | | | | Change-Id: I11b719725ed788cbdd97b0e64d69880949634905 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* CppTools: Fix completion for nested enumsOrgad Shaneh2014-01-213-5/+51
| | | | | | | | Task-number: QTCREATORBUG-5456 Change-Id: I0bb4756e3cdf3c87a4c2b0fbfe6953faaa5e1c52 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* ios: fix handling of command characters in runFawzi Mohamed2014-01-213-14/+44
| | | | | | | | | | | | | | | | | | Xml does not support control characters (even if encoded), thus QXmlStreamWriter does not encode them, and QXmlStreamReader gives an error with them. Thus outputting a control char would stop the application. Now we send them with a special tag and decode them. Note that the Output pane does some emulation of terminal behavior when receiving them. Sending app output as block because otherwise the stange logic within the OutputPane inserts spurious newlines (a string not containing a newline always gets a newline prepended) . Task-number: QTCREATORBUG-11219 Change-Id: I3557ffbb23ca2ea4eec9a97335a95580c9c4482b Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Valgrind: Initialize shortenTemplates-setting.Friedemann Kleint2014-01-201-0/+1
| | | | | | | | Purify reports "Uninitialized Memory Read" for shortenTemplates. Change-Id: Ieab51cd78bf9fc7bbc539ef3158e0f57a12579d7 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmakeParser: Do not leak temporaries into cache of filesTobias Hunger2014-01-171-1/+3
| | | | | | | | | | | | This prevents an access to free'd memory when opening qtcreator.pro. Looks like qml2puppet.pro gets added to that cache in QMakeVfs::writeFile with part of the including pro-file's filename in it. That part gets cleaned when that containing ProFile goes out of scope, leaving a key in QMakeVfs::m_files free'd but accessible. Change-Id: I80b43d2fbb66c214647497ea97e6e3a587e274d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* AndroidDebugSupport: Set more accurate so-libsearch pathDaniel Teske2014-01-171-2/+1
| | | | | | | | | | Task-number: QTCREATORBUG-10382 Change-Id: I6c38fda8a4bf70ae93f6ec7dd671878589056124 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com> (cherry picked from commit eb5b9596398c401d043d20f81fd8b68b02ec5168) Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner.ContextMenu: Crash fixThomas Hartmann2014-01-172-10/+22
| | | | | | | | | The root item cannot be "filled". Adding a try catch block just in case. Task-number: QTCREATORBUG-10476 Change-Id: Ic5c5efddd78194275d7d6e393eb945d6c9d89ed0 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qml: avoid dumping or reading type info multiple timesFawzi Mohamed2014-01-161-3/+6
| | | | | | Change-Id: Id0c52f6a96a5c36893f64cbc96cc7eee300e6afa Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qml: accept qmltypeinfo with larger minor versionFawzi Mohamed2014-01-161-2/+4
| | | | | Change-Id: I56559f6d9bd128069e2c270e033c958a6a239c3a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Git: Fixed bug with branches missing from a listPetar Perisin2014-01-161-1/+1
| | | | | Change-Id: Id4fa9f6c4f874c9b1ac5112efceaf0c22ed84d00 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* do not look for mkspecs/ directories in project treesOswald Buddenhagen2014-01-151-21/+0
| | | | | | | | | | | | | | | this pretty surprising behavior would interfere with building the examples from an installed qt tree with qmakes from other qt builds. .qmake.conf (and .qmake.cache) files provide a possibility to explicitly "anchor" project roots, so there is no point in having a second, even more magic way to do it. Task-number: QTBUG-35485 Change-Id: I8fd4fda67cabafdf55e7a98282dcdfaffb4a405e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/65a676372c533e8b35117081ec0aa1a94e1500e5) Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Mac: Prevent switching to discrete GPU on startupMorten Johan Sørvig2014-01-151-0/+2
| | | | | | | | | | | | | | | | | | | By default, OpenGL-based apps will switch multi-GPU Macs over to discrete graphics hardware. It is possible to prevent this, and it makes sense to do so for Qt Creator since its users will typically be more concerned with power usage than raw OpenGL performance. Commit 8166a34f makes the necessary change to QtBase and this commit enables the non-switching behavior by adding the NSSupportsAutomaticGraphicsSwitching key to the Info.plist Change-Id: Iea6ef4b4922645f792cfb9b8b0b8860f5b2c0674 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QmlDesigner.PropertyEditor: Crash fixThomas Hartmann2014-01-141-0/+3
| | | | | | | | | | | | | There is no guarantee that the selection is still valid, when changeExpression() is called. The signal might be triggered by an EditingFinished() signal that was emitted after the selection was changed. Just ignoring the change is not the ideal solution, but there is not much more we can do. Task-number: QTCREATORBUG-11249 Change-Id: I770dade680b0b8a052efd910b636829d1037e3ad Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* QmlDesigner.MetaInfo: Adding convincience function for testingThomas Hartmann2014-01-142-0/+12
| | | | | Change-Id: Ic9faddd21fdf80357b1360951a1cc054546866e9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.PropertyEditor: Ading missing QtQuick 2 only propertiesThomas Hartmann2014-01-143-0/+24
| | | | | | | | Those properties are QtQuick 2 only and were missing in the property editor. Change-Id: Ie58a4eac86b945bdde24d32fc373396268bb593e Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* QmlDesigner.MetaInfo: Properly resolve prototypes from different pluginsThomas Hartmann2014-01-141-5/+20
| | | | | | | | | If there is a non <cpp> export for the CppComponentValue we use it. Task-number: QTCREATORBUG-11205 Change-Id: Ia82c8fc5f567245f5d04b0fd91819bf443312e17 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlDesigner.FormEditor: crash fixThomas Hartmann2014-01-141-13/+15
| | | | | | | | | | | Anchors and/or anchor targets might be invalid. e.g.: anchors.left: parent We have to check this. Task-number: QTCREATORBUG-11255 Change-Id: Ib939292d0f89cc1d22119972627c03f1e85043db Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlProfiler: Hide timline and show loading indicators when profilingUlf Hermann2014-01-141-0/+2
| | | | | | | | | | | | | This is a temporary fix to work around the fact that the profiler's loading indicator won't show on top of the timeline view. It's not particularly beautiful but at least the UI doesn't just "hang" anymore. A final solution has to be provided in qtdeclarative by allowing widgets to be placed on top of QML scenes. In principle it's also possible to change the loading indicators to be actual windows and by doing that have them stay on top, but the result would be very messy. Change-Id: Ic774b0792786d7d278da5ba0beda4531f0dba77d Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* MainWindow: Delay restoreWindowStateOrgad Shaneh2014-01-132-3/+12
| | | | | | | | | QLayout calls setMinimumSize, which breaks maximized state on Windows. Task-number: QTCREATORBUG-9586 Change-Id: Ibd9ceb8bccbdf26c6369e86ad4918835d645ca1e Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Updater: Only try to fetch updates once (even if it fails)Kai Koehne2014-01-131-1/+2
| | | | | | | Do not repeatedly try to fetch updates, but only once. Change-Id: Id177b6677077e97132c7b40af3de35015a9c7658 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qnx: Add missing placeholders to labelsEl Mehdi Fekari2014-01-101-2/+2
| | | | | | Change-Id: I472cacaea48495bb039b18426bbb2010673d1a65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix change-of-sign warning found by ICCThiago Macieira2014-01-105-6/+6
| | | | | | | | | | | | | -1 is not a valid unsigned value. registerhandler.cpp(354): warning #68: integer conversion resulted in a change of sign return createIndex(row, col, TopLevelId); ^ Change-Id: I41935255704f19724d6cec16ea470e2f8f8a16a1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* WelcomPage: Fix intitial filtering by Qt versionThomas Hartmann2014-01-101-1/+1
| | | | | | | | | | | | | | | | When having multiple Qt versions with examples registered in Creator, the welcome mode showed all of them initially. The reason was that m_uniqueQtId was initialized with noQtVersionsId instead of uniqueQtVersionIdSetting(). The function uniqueQtVersionIdSetting() gets the correct Qt version from the settings as shown in the combobox. Task-number: QTCREATORBUG-10790 Change-Id: I9f435f6372f8b0c0495daf6c6efcf4bcc5e70455 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Windows: Fix stepping through Qt sources.Eike Ziller2014-01-101-2/+1
| | | | | | | | | Build paths of Qt 5.2 changed. Task-number: QTCREATORBUG-11233 Change-Id: I9e3b2d53cb10f09bc1b9d780669ebb72c595ad4f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix compilation when declarative private headers are absentOrgad Shaneh2014-01-081-1/+1
| | | | | Change-Id: I1a58d9bce7c0c6409b0473e81913d7d207b88444 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* ios: speed up device debuggingFawzi Mohamed2014-01-086-17/+63
| | | | | | | | | | Correctly use the device specific cached symbols to avoid downloading them from the device (big slowdown). Task-number: QTCREATORBUG-10884 Change-Id: Ic82482e4b1dadf55f695a67fd420ac1b095a3ca1 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-084013-4067/+4067
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* CppTools: Fix test_modelmanager_defines_per_projectNikolai Kosjar2014-01-071-0/+4
| | | | | | | | The example project parts had no project file set and thus the "right" project part could not be determined in cppeditor.cpp:718. Change-Id: I088571e9d3c3c8790670bbdd8e68190835a85ad5 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* make sure Xlib is in our dependenciesOswald Buddenhagen2014-01-071-0/+1
| | | | | | | Task-number: QTCREATORBUG-11107 Change-Id: I5d0bc2cb34a1c02e2c310df4bd40fa9df198292d Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* EditorManager: Add a soft assertion for editor existenceOrgad Shaneh2014-01-071-0/+1
| | | | | | Change-Id: Ieb1e13a25dd2ac4fbe2c1dba0adbbe93dcc6b4e7 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Separate shadow build directory suffixes and build configuration nameSergey Belyashov2014-01-061-3/+9
| | | | | | | | Task-number: QTCREATORBUG-11113 Change-Id: Idbf1a52d550a76128bb06ccc65029555fe001078 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QmlDesigner.ItemLibrary: Start drag using QTimer::singleShot()Thomas Hartmann2014-01-062-6/+16
| | | | | | | | | | | | | A drag might change the imports which invalidates the model exposed to qml. Since QObjects are deleted when the model is reseted this did lead to a crash in the qml engine, because the object emitting the signal was deleted. To avoid this we call startDragAndDrop() asynchronously using QTimer::singleShot(). Now the object is always deleted after the signal is emitted not during the emit. Task-number: QTCREATORBUG-11139 Change-Id: I92e7f9dfff33697b9ff0da148dc9da629723ab7e Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: Fix crash for master document handlingMarco Bubke2014-01-061-1/+1
| | | | | | | | Happens for dragging a list view in the document. Change-Id: Id8d00fc880789a0e5e85d455850bb1ec3eaac434 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* DocumentManager: Use suitable parent for file reload dialoghjk2014-01-061-1/+2
| | | | | Change-Id: I77c223b505bc97b64fcc27d5fab3514722ebaa02 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* BlackBerry: Give setup wizard a proper parenthjk2014-01-061-1/+1
| | | | | | Change-Id: Ic1e4b85d4edcd1c6f1ea1e38c9219a1a192b6d21 Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* DocumentManager: Use ICore::dialogParent for all dialogshjk2014-01-062-15/+13
| | | | | Change-Id: Id2eda57bc816c8601a3460aaf224852c267d336e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Core: Add ICore::dialogParent() specific for use as dialog parenthjk2014-01-062-1/+15
| | | | | Change-Id: I72dca0f95b418a32ac3859f086053f91b9e9ec67 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>