feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
3,725 Commits 108 Branches 368 Tags
251f09c953494d6b2c9cd3cdec74ed05a2df1ddc
Commit Graph

3725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roberto Raggi
251f09c953 Protected the new (not yet finished) code that merge environments. 2009-07-01 11:00:00 +02:00
Roberto Raggi
ed2eb296b1 Fixed possible crash in the preprocessing phase when the first token in the 
`original' (not preprocessed) token stream has the whitespace atttribute on.
 2009-07-01 10:49:27 +02:00
Roberto Raggi
f8531cc833 Merge the environment from the previous parse. 2009-07-01 10:25:31 +02:00
Friedemann Kleint
02de790714 Moved the custom widget wizard templates into Qt Creators template dir. 
Cannot put a source file template into a resource in a source directory
as Visual Studio will grab and build it.
 2009-06-30 17:11:35 +02:00
Kavindra Devi Palaraja
3264878fe6 Doc - More on Part 5 
Reviewed-By: TrustMe
 2009-06-30 16:58:10 +02:00
Friedemann Kleint
2de887eaa9 Do not give up loading dumpers (MinGW/injection load). 
Acked-by: kh <qtc-committer@nokia.com>
 2009-06-30 16:54:53 +02:00
Thorbjørn Lindeijer
df3484205a Updated changes with new feature by Kevin 
In accordance with new policy of not waiting with updating this file
until the release is nearing.
 2009-06-30 16:50:21 +02:00
Kavindra Devi Palaraja
df04fd06eb Doc - More of Part 5 
Reviewed-By: TrustMe
 2009-06-30 16:32:22 +02:00
Daniel Molkentin
9549205ce4 stub files for 1.3.0 changes 2009-06-30 16:24:30 +02:00
dt
bc3fde7f58 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-30 15:57:25 +02:00
dt
a12dbe9592 Don't hardcode the minimum size for the find toolbar. 
Let Qt figure out the correct monimum size. That fixes a rather strange
resizing behaviour.

Task-Nr: 257144
 2009-06-30 15:57:04 +02:00
Friedemann Kleint
e8dafc28a5 Improve error logging of CDB breakpoint setting. 
Output warnings to debugger log. Prevent breakpoints from
being set several times when loading session data by
clearing the complete break handler.
Reviewed-by: hjk <qtc-committer@nokia.com>
 2009-06-30 15:50:56 +02:00
Kavindra Devi Palaraja
640278e1d0 Doc - More of Part 5 and some minor changes to part 2 to ensure 
that the include statements were explained.

Reviewed-By: TrustMe
 2009-06-30 15:42:30 +02:00
Thorbjørn Lindeijer
ca1dd20036 Made sure the order of the file list is maintained when removing files 
Converting to a QSet and back randomizes the order of the files. Just
doing a linear scan and a QSet for speading up the contains() check
should be enough and maintains the order.
 2009-06-30 15:08:39 +02:00
Kevin Michel
b170e3ba87 Enable 'Remove file...' on Generic project 
Merge-request: 783
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-06-30 15:08:38 +02:00
Michael Karcher
a39d7e8d12 Fix test for debug_and_release_target 
This is a fix for a446491ae8.
The option debug_and_release determines whether the debug/ and release/
subdirectories are used to put *object* files there. The option
debug_and_release_target is used to put the final taget into debug/
and release/ directories.

Merge-request: 745
Reviewed-by: dt <qtc-committer@nokia.com>
 2009-06-30 14:56:26 +02:00
Michael Karcher
eeafec8312 Fix typo 
Merge-request: 745
Reviewed-by: dt <qtc-committer@nokia.com>
 2009-06-30 14:56:26 +02:00
dt
f74d6ad231 Minor cosmetic, reset the buidlmanager watcher on cancel 2009-06-30 12:11:27 +02:00
Sergey Belyashov
7dd60128fd Complete (ex: messages about data dumpers) Russian translation for Qt Creator 1.2 
Merge-request: 780
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2009-06-30 11:39:37 +02:00
Friedemann Kleint
d898dc026d Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-30 10:31:48 +02:00
Friedemann Kleint
47696edcf4 Fix Compilation with MinGW/GCC 4.4 2009-06-30 10:31:23 +02:00
hjk
4b4901b74b debugger: don't remove breakpoints when attaching to running process 2009-06-30 09:48:10 +02:00
Ritt Konstantin
7569c6af90 gcc-4.4 build fix 
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2009-06-30 09:28:41 +02:00
Friedemann Kleint
0e2c7b43c2 Polished the project manager, wizard titles, compiler warnings. 2009-06-30 09:04:48 +02:00
Thorbjørn Lindeijer
b210943b0a Fixed a problem with adding files when final newline is missing 
When there was no final newline in the .files file, the name of the
first new file would get appended to the name of the last file. This
patch fixes that by simply rewriting the whole file.

Also switched to writing out native line endings.
 2009-06-29 18:46:33 +02:00
Kevin Michel
79e2108687 Fix GenericProjectNode filePath, fixes the Add New wizard default path 
Merge-request: 736
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-06-29 18:04:30 +02:00
Kevin Michel
375d81166c Allow adding files in generic project 
Merge-request: 736
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-06-29 18:04:29 +02:00
Friedemann Kleint
ec99630034 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-29 14:47:17 +02:00
Friedemann Kleint
024b548e13 Added a wizard for Qt Designer custom widgets and collections. 
Add the wizard. Modify basefilewizard to use be able to handle binary
data. Add some properties to path chooser (filters).

Task-number: 251982
Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2009-06-29 14:47:04 +02:00
Roberto Raggi
1219b31e03 Produce `join' tokens. 2009-06-29 14:31:25 +02:00
Roberto Raggi
c4fdda5bd6 Compile. 2009-06-29 14:31:25 +02:00
Thorbjørn Lindeijer
341a843bbf Removed two stray backslashes 2009-06-29 14:30:43 +02:00
Thorbjørn Lindeijer
e51811657b No need to open file for reading when just writing to it 2009-06-29 14:30:43 +02:00
hjk
3d9c65f2ee debugger: clear more status variables in initializeVariables() to 
prevent inter-session dependencies
 2009-06-29 13:54:39 +02:00
dt
8f2d0094fd Fix qtcreatorwidgets.pro to use the same logic as qtcreator.pri 2009-06-29 13:50:44 +02:00
hjk
ae3ac786e0 debugger: fix problem where a manual 'continue' was needed after start up. 
The problem was that the 'emptyness' of m_cookieForToken was used as an
indication that there was no response packet still in the air. However,
this hash was not reset after a debugging session was aborted using S-F5,
so it could contain items from a previous run, effectively preventing
automatic triggering of the necessary 'continue'.
 2009-06-29 13:31:35 +02:00
Erik Verbruggen
cc3a57a93a Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-29 11:33:53 +02:00
Erik Verbruggen
f84534287e Fixed mimetype check for Objective-C(++) files. 2009-06-29 11:32:43 +02:00
kh
692c0fbbe4 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-26 16:52:35 +02:00
dt
ed9f834714 Fix crash on removing a .pro file from the project with creator open 2009-06-26 16:52:09 +02:00
kh
a175a5f6ee Implement home page settings and help startup options. 2009-06-26 16:50:50 +02:00
Roberto Raggi
319720f43a Don't add $QT_INSTALL_HEADERS/Qt to the include paths. 
Indexing both /include/Qt and /include/{QtCore,QtGui,...} makes the code completion with fedora.
 2009-06-26 16:36:04 +02:00
dt
952e35a94c Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-26 14:54:45 +02:00
dt
61e7ffc9c7 toolChain() might return a null pointer 
Don't crash then
 2009-06-26 14:53:13 +02:00
hjk
eb409bdab8 debugger: attempty to work around old ini files containing @Invalid() entries 2009-06-26 13:40:16 +02:00
hjk
68fa327407 debugger: set default values for all saved options 2009-06-26 13:24:25 +02:00
hjk
6edbc900b9 debugger: refactoring 2009-06-26 13:18:17 +02:00
Kevin Michel
6f675c287c Changed "Remove", "Move Up" and "Move Down" buttons to be disabled by default 
Merge-request: 737
Reviewed-by: dt <qtc-committer@nokia.com>
 2009-06-26 12:54:23 +02:00
hjk
fc145c2c02 debugger: reduce use of macros in dumper code 2009-06-26 10:52:19 +02:00
hjk
b295aec1ad debugger: fix several small issues in the dumper code 
Fix typo in QChar helper.
Add a auto tests for some of the dumpers.
Make the dumpers compilable for Qt < 4.5 for better regression tests.
Make manual tests compile with Qt < 4.5.
 2009-06-26 10:51:27 +02:00