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

21459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Friedemann Kleint
6da15db62c Debugger: Prevent adding invalid breakpoints. 
Check on session restore and add.
In particular, suppress watchpoints at 0x0,
which hang gdb.

Change-Id: I648f53a709fabdebe641e478f367f1354a315ab1
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-20 10:51:09 +02:00
Leena Miettinen
7348291514 Doc: Layout in Column, Row, Grid, or Flow 
Change-Id: Ic1613e4017a3ff038e235530668afb97f80a31d0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-20 09:52:03 +02:00
Leena Miettinen
a7e09938d3 Doc: update screenshot 
Change-Id: Ibf739024dbc27a0b3b8dd77a277dc5590ed670a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-20 09:41:26 +02:00
Leena Miettinen
40044d80fe Doc: Go into Component function 
Change-Id: I2be678a463370730ebdb9497c30da3b90dbbf931
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-20 09:31:06 +02:00
Daniel Teske
2fa0b073f6 Initialize pointers, fix correct gcc 4.6 warning 
Change-Id: I53a63013e8c440bacd21bacb8afecd9f055cbce4
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
v2.4.0-beta 		2011-10-19 17:34:03 +02:00
Kai Koehne
ae5b9c8a4b Add QML Debugger/Profiler changes to 2.4 changelog 
Change-Id: I54089600c863620c1410ba553cb20c5e8c63bd5a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-10-19 17:04:54 +02:00
Tobias Hunger
fa2c24d92b SVN: Refactor SVN detection code 
Reviewed-by: Jonathan Liu <net147@gmail.com>
Change-Id: Ib78251b69a89ee503bb78ab122c6e37a6ec7aacb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-19 16:12:23 +02:00
Jonathan Liu
67ac492ca0 SVN: Fix handling of svn:externals for Subversion 1.7 
Change-Id: I3f869fd316d2f2a3a41c622321cebb79575c423f
Merge-request: 409
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-19 16:12:08 +02:00
Leena Miettinen
5442a91f6f Doc: update screenshots 
Task-number: QTCREATORBUG-6326
Change-Id: I86e9723399668a716cc4508d511fcb533a896e11
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-19 14:03:11 +02:00
Kai Koehne
c652d3ba63 QtOptionsPage: Don't build qml helpers for 4.8 
They're not required any more.

Change-Id: If55d835600ea0ddf6b6b54f8fdd88e2025fc17be
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-19 13:34:35 +02:00
Kai Koehne
e2b911b41a QtOptionsPage: Fix disabled buttons after "Build All" for helpers 
Remove unbuildable helpers in the table of current ongoing builds.

Task-number: QTCREATORBUG-6320
Change-Id: I55c73a868c87d8cd382e4bbae3ed507dc7ed052b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-19 13:34:28 +02:00
Daniel Teske
4309299f6f Disallow a few more special shell characters 
qmake's quoting of them is broken, thus disallow them

Task-number: QTCREATORBUG-6025
Change-Id: I535f7c59865751bd878b245e4c29f83447b91cce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-10-19 13:30:47 +02:00
Daniel Teske
5b07847ae0 Remove code that has no effect 
Change-Id: I78dfdf4c0c1f8f6901a15a1e084b740d0c5cbf2c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-19 12:30:30 +02:00
Leena Miettinen
1430868d3b Doc: update the path to locator options. 
Fix typos and update screenshots.

Task-number: QTCREATORBUG-6307
Change-Id: Ie015fd50c437519e41e96f63a91894a1f730c662
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-19 12:06:28 +02:00
hjk
4bfa655a21 projectexplorer: add some visual grouping on the run settings page 
Change-Id: If529364653481f9ad4c0005564fae7ff476b1871
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-19 12:05:23 +02:00
hjk
cb430f1d70 debugger: fix order of special actions to start debugging 
Change-Id: I0190012c4fe2ea916947561cb76e7974410fd6a1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-19 12:00:41 +02:00
Jonathan Liu
44a18e30a1 Add support for Subversion 1.7 
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Change-Id: Ide2c13f0e69f9807995539b2634ecec216125d5c
Merge-request: 405
Task-number: QTCREATORBUG-6313
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-19 11:31:25 +02:00
Tobias Hunger
d34dd1410e scripts: Fix handling of spaces 
Change-Id: I8972fc656dadee54467cc710ff2f832f729a2ce8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-19 11:31:11 +02:00
Thomas Hartmann
bbe4cc040b WelcomePage: fix clicking on title 
Task-number: QTCREATORBUG-6348
Change-Id: I13ec93fadcfad83f248e5b5b8615cd8818f8392c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-19 11:21:10 +02:00
Daniel Teske
cc21572b64 Fix -spec parameter not used in profile evaluation nor code model 
Task-number: QTCREATORBUG-4723
Change-Id: I845326bdc8726c27502c66c5aeaacb0d286c54c1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-18 21:21:20 +02:00
hjk
52a66bca82 welcome screnn: adjust color of vertical separator 
Change-Id: Id607064c522f9d88a981a2b2f7ff4fd75d04ead4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 17:54:10 +02:00
Eike Ziller
5dbe570f9c Fix licenses. 
Change-Id: I834bc5da86c97ddaeefb43011444da8ed0e85180
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 17:41:23 +02:00
Friedemann Kleint
051d821296 L10n: Update German translation for 2.4 beta. 
Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-10-18 16:10:01 +02:00
Leena Miettinen
ee9625fd1e Doc: update screen shots 
Change-Id: I10783266291a9fe090f8f8f65d3447e791daefff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-18 15:28:53 +02:00
Leena Miettinen
515033122f Doc: Maemo Qemu Emulator was renamed MeeGo Qemu Emulator 
Update screenshots

Change-Id: I24ed8955ebfe7a35bb0dafcb2bd4f0c4b81c7355
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-18 15:28:15 +02:00
Pawel Polanski
306c859635 Symbian: Stepping into functions has been fixed 
While debugging Symbian C++ applications
stepping into functions has not been working due to
a typo in the python file

Change-Id: I76710fe3f599303059f773030e57d778164bcebb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 13:55:34 +02:00
Oswald Buddenhagen
0164e1bea2 Merge branch '2.3' into 2.4 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
 2011-10-18 13:50:38 +02:00
Tobias Hunger
aa95055eb0 Git: Update settigspage 
Task-number: QTCREATORBUG-6308
Change-Id: Ie791cee6f132a4aab345d6c9b3cde56053476e8d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 13:32:09 +02:00
Thomas Hartmann
e9ff13518a QmlDesigner.propertyEditor: fix caption for BorderImage 
Change-Id: If09b81ad1e5ea0f6e5bc34633a5b65ec261944d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-18 13:30:11 +02:00
Thomas Hartmann
b69fb4c26c QmlDesigner.desktopWidgetsPlugin: fix for metainfo 
Keep default size of TextField and add Label.

Change-Id: I65a90c810b1ec9a105992ee976b6c9c99aa272bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-18 13:29:52 +02:00
Thomas Hartmann
c0b9190044 QmlDesigner.puppet: disable breakbad for qmlpuppet 
Change-Id: Idda4a8b674eaabe24de6b2d0c9f7067046d22d70
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-10-18 13:01:35 +02:00
Victor Ostashevsky
dd324e0634 Ukrainian translation updated 
Debugging with GDB was translated

Merge-request: 406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I60d87b2985ed041279fb7db35d1d77338a234849
 2011-10-18 12:44:16 +02:00
Tobias Hunger
32064c756d Codepaster: Trim server name 
Task-number: QTCREATORBUG-6329
Change-Id: I236f3ae2526d020596c990089fbe6b0e167b4fd9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 12:40:15 +02:00
Oswald Buddenhagen
f7ca927b68 compile with Visual Studio IDE, take 2 
Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 12:14:10 +02:00
Oswald Buddenhagen
58cc0c5a5c de-obfuscate code 
remove pointless condition and join identical branches.

Change-Id: Iefe86e580d485cba1a71e2a379781b342d8c75d8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-18 12:13:51 +02:00
Leena Miettinen
3dbe54b0fe Doc: move options to a new Build & Run category 
Move General settings (from Projects) Tool Chains, Qt Versions,
and CMake settings

Task-number: QTCREATORBUG-6327
Task-number: QTCREATORBUG-6326
Task-number: QTCREATORBUG-6307
Change-Id: I87b2238ac0b44f56363c85366157ae70ac694211
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 11:56:01 +02:00
Aurindam Jana
7a1bf412fb QmlCppEngine: StackWindow Behaviour 
Enable/Disable the stack window based on engine state.
Update the markers in the stack window correctly.

Change-Id: Idbc694aa2a4be9497e2e3b2c9e9a1f463e1c7692
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-18 11:12:55 +02:00
hjk
63dac82a0a debugger: re-enable interrupting in remote setups 
Change-Id: I6d4503ec78e3ce590691dde69992a1599b506fc5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
(cherry picked from commit 0e8657107c)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 10:52:55 +02:00
hjk
ace2b80602 help: Add '...' to indicate there will be another dialog 
Change-Id: Ic884acf20f1d1a48f5306b380338fd0a99d63fa8
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 6ae5065704)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 10:51:42 +02:00
Robert Loehning
e711c1ad5a Squish: Use isinstance() instead of comparing classnames 
Change-Id: Ia0683902e96f1dc175978bdbb13fbd114f6ad739
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-18 10:40:27 +02:00
Aurindam Jana
705472d3d9 QmlEngine: Activate selected frame only in specific states 
Selecting a row in stack window activates the frame only if the
state is InferiorStopOk or InferiorUnrunnable, as followed by
gdbengine.

Change-Id: Iad6a16816c0ffd634572f26e1dcf8c3c577502db
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-18 10:32:00 +02:00
Tobias Hunger
405b8738be ToolChain: Fix parsing of gcc output and localization 
Task-number: QTCREATORBUG-6253
Change-Id: Icb5b204e93e216c94b369349992d1eb21ec60a62
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 10:28:52 +02:00
Friedemann Kleint
5a7d6d66fa Designer: Hint at case-mismatches of #include if 'Goto Slot' fails. 
Task-number: QTCREATORBUG-6310

Change-Id: Ibd10043c775832f3195c39f9d94b72c6d1447c9d
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-18 09:48:29 +02:00
Robert Loehning
1139006b3f Squish: Let one function handle last page of all project wizards 
Change-Id: I74e2c2f0c50a3131ad66fbde5e4a7fe004b7ebff
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-17 18:09:25 +02:00
Pawel Polanski
dbcd5715ad Symbian^3 specific include paths added 
Change-Id: I003066e7aaebaf4508695b8588bb8bea893f992c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 16:48:55 +02:00
Daniel Molkentin
72278e2a4a Manual amendment to c1a8001626. 
Missed one plugin.

Change-Id: Id148f6e818bc18b65cf4b882af6f219a04336978
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 16:38:40 +02:00
Aurindam Jana
2a271e396c Debugger: Show/Hide Address Column in Stack Window 
Show Address column in stack window only if explicitly enabled.
The address column is hidden by default.

Change-Id: I4e4b019dbcde1c2edb9fb3012831eee5054a8a22
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-17 16:26:24 +02:00
Daniel Molkentin
147eac7e04 Fix make install for qml designer plugins. 
Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 15:58:29 +02:00
Robert Loehning
429d62823b Revert "Compile with Visual Studio IDE: string macros don't need to be escaped" 
This reverts commit fe80df7e2f.

With the above commit, Creator could not be compiled with MSVC 2008.

Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 15:52:05 +02:00
Daniel Molkentin
c1a8001626 Install qml customstyleplugin in the right place. 
Change-Id: I1519a7df87eb8d6f499fcfd789eebb6aaa8cf58c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 15:40:24 +02:00