summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.5'Oswald Buddenhagen2012-03-2328-78/+108
|\
| * Squish: Fix changed valuesChristian Stenger2012-03-231-2/+2
| | | | | | | | | | | | | | These values have changed (see src/plugins/projectexplorer/taskmodel.h) Change-Id: I7b351cfae2bceca782ea022b855d86926e942d53 Reviewed-by: Bill King <bill.king@nokia.com>
| * Autodetect CDB's shipped with Windows Kits >= 8.0.Friedemann Kleint2012-03-231-0/+25
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-7182 Change-Id: I153788664067445cece3c7ecf46cf8217539251d Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| * QmlDesigner: crashfixThomas Hartmann2012-03-231-1/+1
| | | | | | | | | | | | | | | | If the node is a component it is not present as an item. Task-number: QTCREATORBUG-7176 Change-Id: I426e2e8bfdf9e0eced566c60e2721d3630ef554a Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
| * Doc: update screen shotsLeena Miettinen2012-03-2321-25/+26
| | | | | | | | | | | | | | | | | | Add references to screen elements in text as numbers. Update link to Qt Quick Designer options. Change-Id: Ifff0f0a203e922943367f9069e8ebb6f35244878 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * debugger: make Attach to Remote... dialogs better accessiblehjk2012-03-224-50/+54
| | | | | | | | | | Change-Id: Ic20897a565c37d45d1521c8934ae0c4759fdef01 Reviewed-by: hjk <qthjk@ovi.com>
* | QtMessageLogHandler: Fix "jumping" cursorAurindam Jana2012-03-232-1/+2
| | | | | | | | | | Change-Id: I1967e8b4da4d1f52c97be557fda0d019e6598c09 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | Fix typosTobias Hunger2012-03-231-2/+2
| | | | | | | | | | Change-Id: I636af8ae9f4bd5a6abd55122cb892eb562159547 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | QmlEngine: Remove unneeded message logAurindam Jana2012-03-231-5/+0
| | | | | | | | | | | | | | | | Introduced by 2.5 merge with master dbcaadd8afdacee02e4e1b2fc65639ac33facafa Change-Id: Id85df5a4f6400850cf36453e4e641f7a25ead888 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* | TreeViewFind: Search in all columnsAurindam Jana2012-03-232-28/+46
| | | | | | | | | | | | | | Extend searching from a specified column to all columns. Change-Id: I939867611dc79376237f3599baab28b408620b62 Reviewed-by: hjk <qthjk@ovi.com>
* | Device: Add method to get the index of a ideviceTobias Hunger2012-03-232-0/+7
| | | | | | | | | | | | | | Add a method to get the index of an IDevice * in the DeviceManager. Change-Id: Icf02c8a682185ebe9ea68fd4edb026d1c8335112 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Debugger: Bring Qt Creator to foreground if app interruptsKai Koehne2012-03-2311-16/+78
| | | | | | | | | | | | Change-Id: I07795f61b79cce9687d0ae2bff3cc19534ec08d6 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Oswald Buddenhagen2012-03-2227-141/+248
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/debugger/qml/qmlengine.cpp src/plugins/qtsupport/gettingstartedwelcomepage.cpp Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76
| * QtMessageLogHandler: Sorting child itemsAurindam Jana2012-03-224-5/+12
| | | | | | | | | | | | | | | | Insert child items in sorted order if the "Sort Members and Classes Alphabetically" is set in Locals And Expressions. Change-Id: Ib21803326ec3f35c9541c08d876c4a38c0202a9f Reviewed-by: hjk <qthjk@ovi.com>
| * Win: Avoid long creator startup times with '\' in PATHTobias Hunger2012-03-221-2/+5
| | | | | | | | | | | | Task-number: QTCREATORBUG-6501 Change-Id: Idfe050486db2d486e895bf6670cad3084871c44a Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| * QtMessageLogHandler: Insert child items in alphabetical orderAurindam Jana2012-03-224-3/+15
| | | | | | | | | | Change-Id: I644207f5e8b149364e73abf7512240e918260072 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * QtMessageLogHandler: Fix crashAurindam Jana2012-03-225-33/+43
| | | | | | | | | | | | | | Set a parent when creating QtMessageLogItem. Change-Id: I8faf76059dcc517794a4eb3d202bc14cd1632ca8 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * debugger: Removed unneeded failing testRobert Loehning2012-03-211-1/+0
| | | | | | | | | | Change-Id: I330d43bfdbba5304bf559e136aa1bc07b5498c4a Reviewed-by: hjk <qthjk@ovi.com>
| * QmlDebugging: Fix 'this' in Locals And WatchersAurindam Jana2012-03-211-23/+59
| | | | | | | | | | | | | | | | | | | | Incase of global object, query the children only when needed as the response takes a lot of time. Remove cached requests when switching stack frames so that stale responses are not parsed. Change-Id: I70887773952ecaa61da21077ffec321fd5fabbb1 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Doc: update screenshots for Qt versions and tool chainsLeena Miettinen2012-03-213-0/+0
| | | | | | | | | | Change-Id: I9de5c75e9cde0946685ed0c6bfa763526fa770ae Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
| * Doc: update screen shots for editor, code style, dependenciesLeena Miettinen2012-03-214-0/+0
| | | | | | | | | | Change-Id: Ia11d769e2afda6ee2835501ac8c304e684f98796 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
| * Doc: update screen shotsLeena Miettinen2012-03-212-0/+0
| | | | | | | | | | Change-Id: Ib25e84017e9f2ff48f7e47abbb309442f8c5408e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
| * QmlDebugging: Fix Watched ExpressionsAurindam Jana2012-03-212-37/+53
| | | | | | | | | | | | | | | | | | | | The data response was incorrectly parsed for watched expressions. This patch fixes the parsing. It also fixes removal and readdition of a watched expression. Change-Id: I1a9e2db3d4963d7fe12ed468ae5466a106011487 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Doc: move debugger settings to separate sectionLeena Miettinen2012-03-215-14/+27
| | | | | | | | | | | | | | Update screenshots Change-Id: I6b69f812284d53d2fde4ee957dbfff1b0e56a032 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Some pixel shifting in split iconshjk2012-03-215-0/+0
| | | | | | | | | | | | | | For the record: I still like the 2.4 one better, but this is progress. Change-Id: I56de3c5806d476e72d57dcf5dc2e1746a8f10f83 Reviewed-by: hjk <qthjk@ovi.com>
| * Examples: Fix showing documentation in side bar.Eike Ziller2012-03-211-0/+3
| | | | | | | | | | | | | | | | | | The new target setup jumps to project mode which doesn't have a help side bar, so it would always jump to help mode for opening the documentation. Change-Id: I83343950d53d230a176b1603ca729e4802972f6e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
| * debugger: Updated self-testRobert Loehning2012-03-211-33/+39
| | | | | | | | | | Change-Id: I065de900e79ee4a73f3056ed764391ef45adde19 Reviewed-by: hjk <qthjk@ovi.com>
* | debugger: add dumper for internal gdbmi style datahjk2012-03-221-0/+10
| | | | | | | | | | Change-Id: If46366182698b4de8df146625339e1af2f0874bd Reviewed-by: hjk <qthjk@ovi.com>
* | QmlDebugger: Fix automatic connection setupKai Koehne2012-03-221-3/+19
| | | | | | | | | | | | | | | | | | Make sure we only try to connect when we're in the right state (EngineRunRequest). Specifically, stop to connect when the engine is finished. Change-Id: Ia4f1f79e8ac5b32ff436e63195516e242d4c120c Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* | QmlJSInspector: Query Objects IterativelyAurindam Jana2012-03-228-18/+106
| | | | | | | | | | | | | | | | Currently all objects are recursively fetched when the root context is retrieved. This patch fetches objects on demand. Change-Id: Idf5c621ec38869dd5a676116bc4df528d7bb2fda Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlDebugging: Add service client for QmlDebuggerAurindam Jana2012-03-2210-21/+243
| | | | | | | | | | | | | | | | Qt5 has renamed the service 'QDeclarativeEngine' to 'QmlDebugger'. Add a new client to connect to the service. Change-Id: I3a03181c4f34c311e47d4a963283b66dc778726b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlEngineDebugClient: Simplify the client and utility classesAurindam Jana2012-03-2215-1316/+526
| | | | | | | | | | Change-Id: I86033bdbdef94c6f17e706f8e13ce390969171c6 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | Mixed debugger: Fix state warnings on exitKai Koehne2012-03-221-0/+2
| | | | | | | | | | | | | | | | | | If the (child) engine is already in state InferiorShutdownOk or InferiorExitOk, it will automatically proceed. No need to call notifyInferiorIll(), which will lead to state warnings. Change-Id: Id7501d327454095648be8c14d02520b2ed128e87 Reviewed-by: hjk <qthjk@ovi.com>
* | debugger: make views searchablehjk2012-03-2212-96/+138
| | | | | | | | | | Change-Id: Icade50bfaa884d88e451e688acf62d6793346628 Reviewed-by: hjk <qthjk@ovi.com>
* | Gdb: Fix shutdown of engine if app exits (gdbserver)Kai Koehne2012-03-221-4/+6
| | | | | | | | | | | | | | | | | | Sometimes the "Remote connection closed" message is the last one we get from gdbserver. handleResultRecord might not be called any more. Change-Id: Ib4c1155bf21c605ac39d75582c1a26676475cb7a Reviewed-by: hjk <qthjk@ovi.com>
* | qbs: sort share.qbs and qtcomponents.qbs alphabetically.Nikolai Kosjar2012-03-222-803/+812
| | | | | | | | | | | | | | Tracking changes will now be easier. Change-Id: I040c5283b3db4b92caa721a3aaafab42d203c654 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | general settings: compile fix msvchjk2012-03-212-10/+6
| | | | | | | | | | | | Change-Id: I377c269db97906796703df0881eb93d16ca95f5d Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | DeviceManager: Use different Singleton implementation.Christian Kandeler2012-03-213-35/+18
| | | | | | | | | | | | | | | | | | | | The "local static" version frees us of the need to clean up manually at the end. This, in turn, means the plugin does not need to know the device manager directly anymore, getting rid of one #include and a friend declaration. Change-Id: Ia4a07f80bfd7cd4cdeed90b3b2b04aa73eb1c7cc Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
* | QDeclarativeEngineDebug: Rename classAurindam Jana2012-03-2112-195/+138
| | | | | | | | | | | | | | Renamed to QmlEngineDebugClient Change-Id: I200e8ccf23a3464e2b6ad07288d17228118e905f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | Examples: Fix showing documentation in side bar.Eike Ziller2012-03-213-16/+12
| | | | | | | | | | | | | | | | | | Opening the project jumped to project mode, which doesn't have a help side bar. We now configure the example project and jump to edit mode before opening the documentation. Change-Id: Ic87d3fd0856862ac9297d43307037f994664acdc Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | Fix qbs project filesMarco Bubke2012-03-213-2/+6
| | | | | | | | | | Change-Id: Iae72cd8f65779617dfa3ae03e9c894a95d151e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creatorEike Ziller2012-03-211-2/+2
|\ \
| * | Disable carbon workarounds on Qt 5.Morten Johan Sorvig2012-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_MAC_USE_COCOA is not defined for Qt 5, which caused GenericProposalWidget to use a carbon workaround during key handling. Add QT_VERSION check. These are the only instances of QT_MAC_USE_COCOA usage in creator. Change-Id: I71ee23e14d791166ccd5645c52b152489d7f8f72 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-2142-1265/+406
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp src/libs/zeroconf/servicebrowser.cpp src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qmlprofilerengine.cpp src/plugins/qmlprofiler/qmlprofilertool.cpp src/plugins/qmlprofiler/qmlprofilertraceview.h src/plugins/qmlprofiler/tracewindow.cpp Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
| * debugger: fix quote style and capitalization in gutter menuhjk2012-03-201-3/+4
| | | | | | | | | | Change-Id: I054230bb910bdb400bd2494a449993bdb0bbf011 Reviewed-by: hjk <qthjk@ovi.com>
| * debugger: continue after breakpoint in self-testRobert Loehning2012-03-201-0/+1
| | | | | | | | | | | | | | | | Done-by: hjk Change-Id: I8405f88c963df359a9ae7f2a779ef0401b3c5994 Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
| * Doc: changes in the new project wizardLeena Miettinen2012-03-202-7/+9
| | | | | | | | | | | | | | Update screenshot Change-Id: I08e43f52c6a7dfa8c27452eed2d10d9b453873b3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * debugger: Added comment how to make USE_AUTORUN usableRobert Loehning2012-03-201-0/+2
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-6951 Change-Id: Ib271f8f2c22705dae5cb799454ee52c22c5bec9d Reviewed-by: hjk <qthjk@ovi.com>
| * Added test for lambda function definitions.Erik Verbruggen2012-03-201-8/+36
| | | | | | | | | | Change-Id: I2233aa98a07e9c23463d4bec0b09dcccb89deb58 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * C++: Fix lambda declarator processingFlex Ferrum2012-03-201-2/+6
| | | | | | | | | | | | | | | | | | Now Qt Creator does not warn about lambda declaration with not empty parameters list. Task-number: QTCREATORBUG-6243 Change-Id: I07121a80fbca98c36820d1d8bb1be6e82ab96b12 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
View Lorry Controller Status