Commit Graph

68765 Commits

Author SHA1 Message Date
Roberto Raggi
ee6d2df072 Removed unused code. 2009-07-02 11:16:14 +02:00
Thorbjørn Lindeijer
c55eb917e4 Abort rename when text is changed due to unsupported actions
Done with Roberto Raggi and mae.
2009-07-02 10:48:03 +02:00
Thorbjørn Lindeijer
d9c8f945a5 Added in-place renaming
Done with Roberto Raggi
2009-07-02 10:48:02 +02:00
dt
060a9ee0b5 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-07-01 18:26:10 +02:00
dt
e90696686c Check for a Makefile before running make clean in the debugging helper
directory

Fixes smart make scripts that try to guess the correct working directory
for make.
2009-07-01 16:33:25 +02:00
Friedemann Kleint
f7da76ab27 Fix Gui app wizard to write form classes consistent with Designer.
Make Gui app wizard use Qt Designer wizard code to write the classes.
Remove the settings from the form class wizard page extension area and
add a settings page instead. Polish the designer plugin's structs to
parametrize class generation with QSharedData and settings code.
Export them and use them in the Gui app wizard.

Task-number: 256927
2009-07-01 16:27:40 +02:00
hjk
ffee3f98af debugger: fix regression in QVariant dumper 2009-07-01 14:15:44 +02:00
hjk
013437cfab debugger: add widget watchers by mouse click in the debugged application.
The option is hidden in the context menu.
Currently the application must be stopped.
2009-07-01 14:15:44 +02:00
hjk
ac8e371486 remove duplicate entries in File->New->Header, project combobox. also, sort that list 2009-07-01 14:15:44 +02:00
hjk
5797b28f9c debugger: initialize values in saved actions to prevent triggering updates
when reading settings
2009-07-01 14:15:44 +02:00
hjk
ed3b984910 debugger: fix bug in new watch model that led to not re-fetching outdated information. 2009-07-01 14:15:44 +02:00
hjk
41ec53b6c3 debugger: remove debug message 2009-07-01 14:15:44 +02:00
hjk
4d6f8028df debugger: replace a Q_ASSERT by QTC_ASSERT 2009-07-01 14:15:44 +02:00
Kai Koehne
084d3d7839 Allow repeated calls of SideBar::readSettings
Remove any existing SideBarItems before adding the ones stored
in the settings.

Reviewed-by: Thorbjørn Lindeijer
2009-07-01 11:56:00 +02:00
dt
a678cf513b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-07-01 11:16:17 +02:00
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
dt
7debdc2b75 Add all cmake files to the project tree
That is if using a cmake that outputs enough information. The necessary
patch for that was commited to cmake's cvs recently by Alexander
Neundorf.

Task-Nr: 250399
2009-06-30 17:38:27 +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
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
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
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
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
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