feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
14,650 Commits 108 Branches 368 Tags
d95f3324c7545a1b30bca8d6d5796bd0adc2affb
Commit Graph

14650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill King
d95f3324c7 tests: remove unnecessary TARGET = tst_$$TARGET 
"CONFIG += testcase" does this for us, and is the proper way to do this.
 2010-10-20 15:03:01 +10:00
Bill King
5217ca8096 tests: get qmldesigner coretest running again 2010-10-20 14:57:07 +10:00
Bill King
54c8a2e5b5 Tests: Get autotests compiling again. 2010-10-20 14:16:04 +10:00
Oswald Buddenhagen
f0aa5cdabb Utils::Environment::find() => constFind() 
it really is already that
 2010-10-19 19:12:45 +02:00
Tobias Hunger
0a5094097d Welcome: Do not open main.cpp when project loading was canceled 
When choosing an example from the welcome screen and the user
cancels loading the project:
 * Do not switch to edit mode
 * Do not load main.cpp
 * Do not pop up help

Task-number: QTCREATORBUG-2774
Reviewed-by: Daniel Molkentin
 2010-10-19 16:16:04 +02:00
Pawel Polanski
a6cfa0ca45 Added cert filter for SymbianOS 2010-10-19 11:45:39 +02:00
Pawel Polanski
d5aabcff5d Simplified key selection for Symbian while choosing cert-key file pair 
Reviewed-by: Tobias Hunger
 2010-10-19 11:20:33 +02:00
Friedemann Kleint
699495f017 Fix compiler warnings, constify. 2010-10-19 08:55:55 +02:00
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
 2010-10-18 20:59:12 +02:00
con
9240ceaf35 Add the path to the installed Qt Frameworks on Mac. 
Otherwise all the Qt headers might not be found at all.

Task-number: QTCREATORBUG-1377
Reviewed-by: Tobias Hunger
Reviewed-by: Erik Verbruggen
 2010-10-18 18:11:40 +02:00
con
8f0b3f463f Yet another missing utf8 encoding for file search. 
Task-number: QTCREATORBUG-65
Reviewed-by: Robert Loehning
 2010-10-18 18:11:40 +02:00
Christian Kandeler
9137c376e0 Maemo: Don't monopolize the debian directory. 
Using a debian directory in the project root directory might interfere
with non-MADDE configurations.
We therefore introduce an extra directory qtc_packaging, where we can
safely put our stuff. In the future, this should also contain
non-Fremantle (and possibly non-Debian) configurations.

Reviewed-by: Oswald Buddenhagen
 2010-10-18 17:47:10 +02:00
Thomas Hartmann
1b7a2dfe17 QmlDesigner: fixes property editor 
Recent changes in 4.7 rendered the original qml code invalid

Task-number: QTCREATORBUG-2765
Reviewed-by: Marco Bubke
 2010-10-18 17:32:09 +02:00
mae
da5cdda70d Fixed find scope 
There was an off-by-one error for the normal find scope.
Improved look by ignoring the left side.
 2010-10-18 15:45:21 +02:00
Friedemann Kleint
cb390587fa Debugger: Fix Python-based dumping of std::string. 
Sometimes, std::string is seen instead of std::basic_string<>.

Reviewed-by: hjk
Reviewed-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
Task-number: QTCREATORBUG-2662
 2010-10-18 15:04:49 +02:00
Friedemann Kleint
923c907d2e Debugger: Fix slashes in breakpoint display. 
Reviewed-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
 2010-10-18 14:54:42 +02:00
Erik Verbruggen
deb2ccd2ca Fixed the link style in the application output window. 
Reviewed-by: Tobias Hunger
 2010-10-18 13:33:55 +02:00
Friedemann Kleint
f3cb1f0bf3 Profile editor: Fix ambiguous shortcut F2. 
Caused by b6da2d4537.
 2010-10-18 12:59:24 +02:00
Erik Verbruggen
f3834f010b Fixed an invalidly named method. 2010-10-18 12:40:34 +02:00
Erik Verbruggen
50ab71bbdc QML: use Qt4 output formatter to get links in errors to work. 
Reviewed-by: Tobias Hunger
 2010-10-18 12:40:34 +02:00
Leena Miettinen
b5bb0aceee Doc - update version control system section 
Reviewed-by: Tobias Hunger
 2010-10-18 12:04:57 +02:00
Leena Miettinen
2dbbfc621f Doc - Debugging QML and Java Script 
Reviewed-by: Kai Koehne
Reviewed-by: Christiaan Janssen
 2010-10-18 11:48:44 +02:00
Leena Miettinen
b5893efe67 Doc - fix links to 4.7 docs 2010-10-18 11:48:43 +02:00
Leena Miettinen
b18bc826ab Doc - remove hyphens from sub... 2010-10-18 11:48:43 +02:00
Tobias Hunger
ac2f0f1ca3 Environment: Fix crash searching executables in windows 2010-10-18 11:10:55 +02:00
Tobias Hunger
cf257b3a44 Doc: Update documentation on VCS 2010-10-18 10:14:56 +02:00
Robert Loehning
886c4034d4 L10n: Translated new strings for breakpoints 2010-10-15 18:37:27 +02:00
Tobias Hunger
b2ba7c706e Script: Improve mytasks.pl script 
* Make it handle branches other than master
 * Make it warn about whitespace related issues.
 2010-10-15 18:28:32 +02:00
Tobias Hunger
1ff6f940fc Environment/Win: Handle extensions when looking for executables 
Properly handle extensions when looking up executables in the path
on windows.
 2010-10-15 18:28:19 +02:00
Tobias Hunger
645730361a Typo fix. 2010-10-15 18:27:44 +02:00
Tobias Hunger
6dbebdf717 Fix running of executables for generic projects 
Task-number: QTCREATORBUG-2726
Reviewed-by: Oswald Buddenhagen
 2010-10-15 18:26:39 +02:00
Tobias Hunger
11fb6d1c52 Git: Rename "reset" back to "undo uncomitted changes" 
Rename "Reset..." back to "Undo Uncommitted Changes..." to be more
in line with git gui as well as the file-based operations.

Reviewed-by: Leena Miettinen
 2010-10-15 18:02:47 +02:00
Tobias Hunger
e419119bb9 Git: Update string 
Refer to "blame", not "annotate" since that is what we call the
action elsewhere.

Reviewed-by: Leena Miettinen
 2010-10-15 18:02:46 +02:00
Thorbjørn Lindeijer
c5d5657c13 Don't cut off zoomed font sizes to the nearest integer point size 
This caused it to go to 0 when for example displaying size 9 at 10%,
which is an invalid value so it caused the text to revert back to the
default size.

It also caused zooming to sometimes appearing to have no effect. For
example zooming size 9 to 110% would still yield size 9 rather than 9.9.

Task-number: QTCREATORBUG-2744
Task-number: QTCREATORBUG-2745
Reviewed-by: Robert Loehning
Reviewed-by: hjk
 2010-10-15 17:44:15 +02:00
Tim Jenssen
4af1d09535 added possiblity to keep the progress widget 
- the Nokia Qt SDK UpdateInfo plugin progress should stay in the
    progress view till the user clicks on it
  - now the futureprogress knows the difference between:
    KeepOnFinishTillUserInteraction and KeepOnFinish

Reviewed-by: con
 2010-10-15 17:29:30 +02:00
Thorbjørn Lindeijer
3051fd4c98 Removed QML snippets for effects, since they have been removed from QML 
At least for now QML has no built in effects like DropShadow, Colorize
or Blur. So it makes no sense to keep the snippets for adding these.

Reviewed-by: Roberto Raggi
Reviewed-by: andre
 2010-10-15 16:52:19 +02:00
Thorbjørn Lindeijer
d0e0bb7bf0 Trim the snippets to avoid adding superfluous newlines at the end 
Reviewed-by: Leandro Melo
Reviewed-by: hjk
 2010-10-15 16:44:47 +02:00
Robert Loehning
d74c4f8aeb Fixed warning about unused parameter in BreakHandler 
Reviewed-by: hjk
 2010-10-15 15:33:34 +02:00
Robert Loehning
92322229b7 Fixed strings in context menu when breakpoints don't have a number 
Task-number: QTCREATORBUG-2742

Reviewed-by: hjk
 2010-10-15 15:28:46 +02:00
Arvid Ephraim Picciani
4d14920ad6 clean up WatchData 
Reviewed-by: hjk
 2010-10-15 15:19:11 +02:00
Christian Kandeler
235430fd8a Maemo: Add support for checking available TCP ports on device. 
Reviewed-by: kh1
 2010-10-15 15:08:31 +02:00
Kai Koehne
d617edffac QmlApp wizard: Bump version number 
Make sure changes in 0a8c34d382 are applied to existing
.pro files too.

Reviewed-by: TrustMe
 2010-10-15 14:56:26 +02:00
Christian Kandeler
1647ef04cc Maemo: Dialog for updating .pro files should not have "Cancel" button. 
Reviewed-by: kh1
 2010-10-15 14:41:48 +02:00
Kai Koehne
774c2ec205 Debugger: Allow pure qml debugging if no C++ debugger is configured 
Don't complain e.g. about a missing cdb debugger if the user doesn't
want to debug C++ anyway.

Task-number: QTCREATORBUG-2376
Reviewed-by: hjk
 2010-10-15 13:38:12 +02:00
Daniel Molkentin
2c0dae7dad Remove special code path for QML examples 
QML examples are now read like any other Qt example, but still get their
own dropdown box.

Advantages:   Less code, proper naming, also loads the help if available
Disadvantage: Only contains a few examples, instead of all. We now
              trust whoever made the selection for Qt Demo.

Reviewed-by: con
 2010-10-15 13:18:06 +02:00
Daniel Molkentin
551ed8228c Git integration: Disambiguate precedence to silence gcc warning 
Reviewed-by: Tobias Hunger
 2010-10-15 13:18:06 +02:00
Thorbjørn Lindeijer
0c0df86d30 Removed tab characters in QML Item snippet 
Trivial fix.
 2010-10-15 13:05:55 +02:00
Kai Koehne
665527346c QmlObserver: Fix "Waiting for connection ..." message box on exit (Windows) 
Disable the message box feature alltogether: Debugging output should be
captured by QtCreator already.

Task-number: QTCREATORBUG-2748
 2010-10-15 12:54:07 +02:00
Oswald Buddenhagen
885260f864 remove dead code 
Reviewed-by: hunger
 2010-10-15 12:48:27 +02:00
kh1
ab90be31de Some minor mobile app template fixes. 
Reviewed-by: ck
 2010-10-15 12:45:08 +02:00