feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,107 Commits 108 Branches 368 Tags
1c52bed5d00c558569d03e65de1c6a31f3ccd3cc
Commit Graph

21107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Koehne
d943015c76 DebuggingHelper: Use right toolchain 
Don't just use an arbitrary toolchain, which might break esp. for Symbian.
Instead, retrieve the toolchain from the project, or in the case of the Qt Options
page let the user choose.

Change-Id: I6d271c485420e609d223d8cece754ef84e573745
Reviewed-on: http://codereview.qt.nokia.com/1978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-22 12:07:50 +02:00
Christian Kandeler
8d5b3677ea Harmattan: Use "single-instance" in default desktop file. 
Change-Id: I30b6fe90ea37cc28f93710efcb4233028ca0f90d
Reviewed-on: http://codereview.qt.nokia.com/2029
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 11:55:03 +02:00
Thomas Hartmann
10ff6f595b QmlDesigner.rewriter: fix for linebreaks 
fixing escape() and descape()

Task-number: QTCREATORBUG-5528
Change-Id: Ia51aee21875c912685d38b61fcda6c048ca1e246
Reviewed-on: http://codereview.qt.nokia.com/2027
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-22 11:51:37 +02:00
Thomas Hartmann
a558c3218b QmlDesigner.propertyEditor: support for line breaks in text edit 
Also fixing a crash regarding translation.

Task-number: QTCREATORBUG-5528
Task-number: QTCREATORBUG-5527
Change-Id: I478d72c3fc5e79919011ff709fcf363054fbca4e
Reviewed-on: http://codereview.qt.nokia.com/2028
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-22 11:51:22 +02:00
Daniel Teske
58cd24846c Clean up before building debugging helpers 
Task-number: QTCREATORBUG-5532
Change-Id: Ic00b486c8bad9b7f4abc61cbd55893b236c4c8cc
Reviewed-on: http://codereview.qt.nokia.com/1880
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-22 11:47:57 +02:00
Christian Kandeler
4bf65fe47b RemoteLinux: Split up "remote processes" functionality... 
... into generic and Maemo-specific parts.

Change-Id: If1f3664ed7320d3e51655cc092cea36be1a9fe66
Reviewed-on: http://codereview.qt.nokia.com/2026
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 11:39:10 +02:00
Christian Kandeler
db7f0ae829 WelcomeScreen: Fix compilation with namespaced Qt. 
Change-Id: Ia5695feaebba959f84ab4d2707a2d5f1667ad3c7
Reviewed-on: http://codereview.qt.nokia.com/1960
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 11:15:41 +02:00
Christian Kandeler
164cd970e5 FileUtils: Add some safety checks to removeRecursively(). 
Change-Id: I657f8416081ce7d253f4a3ef9722a39ac34b5f24
Reviewed-on: http://codereview.qt.nokia.com/1955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-22 11:15:23 +02:00
Leena Miettinen
1095ad5861 Doc: using Qt Quick Components for Symbian with Qt Mobility 
Change-Id: Ie143e560f67cb99b7b4a70736071eefd57a2e381
Reviewed-on: http://codereview.qt.nokia.com/1954
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-07-22 09:15:07 +02:00
Friedemann Kleint
8d86836072 QMLProject: Use cancel button. 
Change-Id: I2c9b3d3fb6b48428a0b8b9c46c5c994eb8941e13
Reviewed-on: http://codereview.qt.nokia.com/1979
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-22 08:34:34 +02:00
Marco Bubke
f9a3fd338c QmlDesigner.NodeInstances: Reparent after value setting 
Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 18:59:40 +02:00
Christiaan Janssen
773bc1a799 QmlProfiler: semitransparent gap in zoom indicator 
Change-Id: I0dcb7dabdb2f276d509a8c4eb09e02f8af56cbed
Reviewed-on: http://codereview.qt.nokia.com/1953
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-21 16:47:48 +02:00
Marco Bubke
30364a130e QmlDesigner: Fix qreal is not double 
Task-number: QTCREATORBUG-5547

Change-Id: Id23737f292de00232deac792d3db2bd36bda0efe
Reviewed-on: http://codereview.qt.nokia.com/1947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 16:09:58 +02:00
Thomas Hartmann
06e21cf3f4 QmlDesiger.propertyEditor: fix for opacity 
Task-number: QTCREATORBUG-5517
Change-Id: I76ce708a4bcad0afe4716877d4c826d1a1a74537
Reviewed-on: http://codereview.qt.nokia.com/1963
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 16:08:33 +02:00
Thomas Hartmann
38c14fac94 QmlDesigner.documentController: fix for subcomponents 
The change to master model has to be before extractText().

Change-Id: I7e791098ddec8cbc8bd597e4ef4fdb97ef01a6e4
Reviewed-on: http://codereview.qt.nokia.com/1961
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 15:44:12 +02:00
Kai Koehne
8c356d957a MobileAppWizards: Use correct line endings on Windows 
Make sure the generated .cpp, .pro files use CRLF on Windows.

Task-number QTCREATORBUG-5124

Change-Id: I3b47a347f1da62f3c654a91720ccc23024b774be
Reviewed-on: http://codereview.qt.nokia.com/1931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-21 15:57:45 +02:00
Kai Koehne
372b10db87 FileInProjectFinder: Fix compilation with 4.7.4 
Don't depend on QUrl::isLocalFile, which only exists in 4.8.

Change-Id: I67a8e35c8754396424c5578216bc6deb02ae0d50
Reviewed-on: http://codereview.qt.nokia.com/1959
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-21 15:52:44 +02:00
Kai Koehne
d50f99cb27 DebuggingHelper: Log the toolchain that is used to debugging output 
Change-Id: Ia78c2b1cad4135cf3325eb612ccc81d6c3c4fc67
Reviewed-on: http://codereview.qt.nokia.com/1945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 15:36:55 +02:00
Christiaan Janssen
d319065645 QmlProfiler: rendering event information popup next to cursor 
Task-number: QTCREATORBUG-5538
Change-Id: I6cb4ac6924eda2588657dbea0d51166ad0c01340
Reviewed-on: http://codereview.qt.nokia.com/1948
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 15:27:22 +02:00
Kai Koehne
9c554ba021 QmlDebugging: Force build for all Symbian targets 
Don't stop if e.g. the build for the very first target winscw fails.

Change-Id: I9a8e06045340f2921018bcbe8d2587d848f9aa3f
Reviewed-on: http://codereview.qt.nokia.com/1944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-21 15:21:29 +02:00
Christiaan Janssen
b06bcf7e2a Analyzer: show correct displayName when StartParameters not used 
Change-Id: I8c1dd66bca57e043fabed3d9d7726a58513cbcf9
Reviewed-on: http://codereview.qt.nokia.com/1942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-21 15:20:49 +02:00
Thomas Hartmann
cb39679758 QmlDesigner.propertyEditor: fix ui for borders and colors 
Hiding controls was a bad idea. It is better to disable them and give
them sensible tooltips.


Task-number: QTCREATORBUG-4667
Task-number: QTCREATORBUG-5433
Change-Id: I2361fbbd3c28a5b9c07787abedf0439d6a7d1ad1
Reviewed-on: http://codereview.qt.nokia.com/1946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 13:28:43 +02:00
Thomas Hartmann
ef2023c5ff QmlDesigner.propertyEditor: layout fix 
Task-number: QTCREATORBUG-5522
Change-Id: I932a40e459ef1160fc362185b22e7dcd0db3237d
Reviewed-on: http://codereview.qt.nokia.com/1940
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:32:20 +02:00
Kai Koehne
51a9ff7d4e Qml Tooling: Fix debugging & profiling of .qml files loaded from resources 
Don't expect that every url specifying a file is a local file url. Instead
let FileInProjectFinder handle urls with other schemes gracefully, too.

Change-Id: I72457d502ff1caf52f588e8ec41ab260882d1cf5
Reviewed-on: http://codereview.qt.nokia.com/1840
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-21 12:27:43 +02:00
Eike Ziller
ebf4212f71 Attach tags to bottom of description. 
Change-Id: Idbd219ec17ba36c14565c08be4c7cd2e1246f1b1
Reviewed-on: http://codereview.qt.nokia.com/1933
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-21 12:16:40 +02:00
Eike Ziller
5391a20adf Use push button instead of tool button. 
Looks really ugly on Mac otherwise.

Change-Id: I062f5ab4a585c88db4a955079545ff023e677ea4
Reviewed-on: http://codereview.qt.nokia.com/1932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-07-21 12:10:34 +02:00
Christiaan Janssen
ef58d3e40b QmlProfiler: avoid reference to connection in UI 
The reference to the "connection" instance can become a dangling pointer.

Change-Id: Icde6fed39d19f35420904f718d12931d297d1511
Reviewed-on: http://codereview.qt.nokia.com/1934
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 12:08:39 +02:00
Thomas Hartmann
ed678f8726 QmlDesigner.propertyEditor: layout fixes for expression editing 
Task-number: QTCREATORBUG-5045
Change-Id: Ie3ab670edef3aa82187ca0e4cfb1124218ff6a29
Reviewed-on: http://codereview.qt.nokia.com/1936
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:08:03 +02:00
Thomas Hartmann
467e94af2b QmlDesigner.property: small fix for font size 
Allow font sizes up to 400

Task-number: QTCREATORBUG-5555
Change-Id: I78fb5983353e0c45d6472b3af3142c8eee597643
Reviewed-on: http://codereview.qt.nokia.com/1938
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:06:42 +02:00
Thomas Hartmann
97ff8236e8 QmlDesigner.propertyEditor: fixes name of property 
Change-Id: I40861eb2bffa542578d69d4648ae358abea0aa4f
Reviewed-on: http://codereview.qt.nokia.com/1937
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:06:21 +02:00
Eike Ziller
8f95fb4996 Remove empty tab above news section. 
Change-Id: I5f7a05ebc7f7c44d55e916fec02eec7420b83f1d
Reviewed-on: http://codereview.qt.nokia.com/1921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-21 11:59:47 +02:00
Christian Kandeler
a1748e4bbe RemoteLinux: Split up generic and Maemo/MeeGo-specific device tests. 
Change-Id: I45154021e85727db746d33ab6ca53f8005d1c55b
Reviewed-on: http://codereview.qt.nokia.com/1935
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-21 11:42:56 +02:00
Christiaan Janssen
409ed3b275 QmlProfiler: show warning when no observer is present 
Task-number: QTCREATORBUG-5536
Change-Id: I2cd1e62f78af3b1b18a3e318ad29ee0343c48b29
Reviewed-on: http://codereview.qt.nokia.com/1930
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 10:54:27 +02:00
Christiaan Janssen
ed5030f124 QmlProjectManager: moved the no-observer warning dialog to qmlprojectplugin 
Change-Id: I6ce724e0db17d22616adcdf058d1f05af7124b64
Reviewed-on: http://codereview.qt.nokia.com/1929
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 10:54:16 +02:00
Christian Kandeler
c2b9c46e46 QmlJsTools: Add missing dependency. 
Change-Id: I60a5db0d9927fa51662f944462fb0b776de48662
Reviewed-on: http://codereview.qt.nokia.com/1924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-21 10:33:22 +02:00
Friedemann Kleint
c9ffc770aa Fix release build warnings about unitialized variables. 
Change-Id: I1a6ba631b0626969b328276a91561c34154c9a1c
Reviewed-on: http://codereview.qt.nokia.com/1920
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-21 10:02:29 +02:00
Daniel Molkentin
02f57e820b Utils::NetworkAccessManager: Fix typo in generic unix case. 
Change-Id: I25d11af5bff0cca3ed6f0bf2f11e928c4e75a423
Reviewed-on: http://codereview.qt.nokia.com/1903
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-21 08:31:12 +02:00
Daniel Molkentin
49b5556921 Refactor: Move NAM to utils, rss model to welcome. 
Change-Id: I0dddedd820e75df05c3a028e7fbb02b642c79659
Reviewed-on: http://codereview.qt.nokia.com/1902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-21 08:30:58 +02:00
Marco Bubke
d20594a71d QmlDesigner.NodeInstances: Better handling of qml puppet problems 
Task-number: QTCREATORBUG-4909

Change-Id: I4cad62e379ba66c3ab9eddb2d770f39eb1e07ff8
Reviewed-on: http://codereview.qt.nokia.com/1901
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 18:36:30 +02:00
Daniel Molkentin
94c8314343 Fixes and UI-Changes: 
- Swap Recent Sessions and Recent Projects
- Fix tooltip error
- Change column width ratio in develop screen from 50/50 to 40/60
- reapply fix for off-by-one pixel error in the tab widget

Change-Id: Ibbcea66262723fed1a54ac63b735bc25241d1846
Reviewed-on: http://codereview.qt.nokia.com/1891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:26:19 +02:00
Daniel Molkentin
a994a6dad0 Reapply 0461150b85. 
After conflict resolution.

Change-Id: I888b0d110d20df88e1cb96424717e914a9a613de
Reviewed-on: http://codereview.qt.nokia.com/1890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:26:12 +02:00
Daniel Molkentin
456263e5fa Silence (false) warnings from QtDeclarativeEngine 
Change-Id: Ice8b6624c6aed41869617adaae59a509eaea7268
Reviewed-on: http://codereview.qt.nokia.com/1892
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:26:02 +02:00
Daniel Molkentin
79ad453485 Reapply 22d6dfa45a 
without 'manage sessions' button after Jens' relayouting.

Change-Id: Ida3e2e01a2ecae258be026bab22c76ede26020f6
Reviewed-on: http://codereview.qt.nokia.com/1889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:25:17 +02:00
Marco Bubke
e2d02bfb14 QmlDesigner.FormEditor: Fix root item visibility 
Task-number: QTCREATORBUG-5504

Change-Id: I8ecf06c221d9e69bf25785940b390d744386f6a5
Reviewed-on: http://codereview.qt.nokia.com/1896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 16:38:30 +02:00
Jens Bache-Wiig
08f1e2e17a Fix tooltip and prettified Develop tab 
Change-Id: I422a15558305a805af5a037f7537daaddd866a92
Reviewed-on: http://codereview.qt.nokia.com/1651
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:55 +02:00
Jens Bache-Wiig
3d8fdcf02a Make use of splitters 
Change-Id: I02f0d4af1aedc45914424f68a32d3970bf936806
Reviewed-on: http://codereview.qt.nokia.com/1650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:49 +02:00
Jens Bache-Wiig
08ba842388 Fixed tabs and missing pixmap 
Change-Id: Ieaf7956f90a269cc582af5c6e8f08faa4b624b8e
Reviewed-on: http://codereview.qt.nokia.com/1649
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:43 +02:00
Jens Bache-Wiig
db5f5d5676 Re-order the feedback buttons 
Change-Id: Ie10a5bc9394753aed5e13e772364d0357f577db1
Reviewed-on: http://codereview.qt.nokia.com/1587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:29 +02:00
Jens Bache-Wiig
0831e6e501 Improved resizing behavior 
Change-Id: I9f2156e996ea233cbe5424ad2e615e936b729443
Reviewed-on: http://codereview.qt.nokia.com/1578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:18 +02:00
Jens Bache-Wiig
e19dd9d1d6 Roll back some of the diff 
Change-Id: Id36db8de505be94ca2005280d16d767bafc21a23
Reviewed-on: http://codereview.qt.nokia.com/1573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:12 +02:00