Commit Graph

4817 Commits

Author SHA1 Message Date
Oswald Buddenhagen
1eae0c6bbf add fixnavi target for convenience 2010-12-08 16:28:52 +01:00
Oswald Buddenhagen
b86ffdffe8 fix fixing of navigation with multiple files 2010-12-08 16:28:52 +01:00
Leena Miettinen
26d5047497 Doc: opening projects
Task-number: QTCREATORBUG-2426

Reviewed-by: Tobias Hunger
2010-12-08 12:29:01 +01:00
Leena Miettinen
f73d4bcbd2 Doc: replace build example with a Qt Quick application
Reviwed-by: Carsten Owerfeldt
2010-12-08 12:29:00 +01:00
Leena Miettinen
c017e82c51 Doc: fix link to previous page 2010-12-08 12:28:59 +01:00
con
519b544f62 Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
2010-12-08 10:57:21 +01:00
Leena Miettinen
e15e62c348 Doc: deploy configurations
Publishing to Ovi Store

Reviewed-by: Tobias Hunger
Reviewed-by: Pawel Polanski
2010-12-06 17:14:22 +01:00
Leena Miettinen
78bb63e0cd Doc: explain build, run, and deploy configurations
Reviewed-by: Tobias Hunger
2010-12-06 17:14:21 +01:00
Leena Miettinen
1d074a9135 Doc: fix typo 2010-12-06 17:14:20 +01:00
Leena Miettinen
a7e1255066 Doc: add Windows 7 to OS list
Task-number: QTCREATORBUG-3140

Reviewed-by: Robert Loehning
2010-12-06 17:14:19 +01:00
con
a9c803d310 Version bump. 2010-12-02 10:38:04 +01:00
Christian Kandeler
7a5c004763 Maemo: Change installation prefix for non-Fremantle systems.
- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.
2010-12-01 16:56:51 +01:00
con
61ebb308e6 Merge commit 'bd8b23d4bad4191367e7c5eb3297769a2477afec' (origin/2.1)
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
2010-11-25 17:36:50 +01:00
Leena Miettinen
f9ba753654 Doc: installation packages are created when project is run (not built)
Reviewed-by: Alessandro Portale
2010-11-24 16:28:38 +01:00
Leena Miettinen
a5ddef5d5c Doc: revert startup scripts
Reviewed-by: Robert Loehning
2010-11-24 13:20:38 +01:00
Leena Miettinen
2f79abcc45 Doc: change the SDK name to Nokia Qt SDK
Reviewed-by: Robert Loehning
2010-11-24 13:20:37 +01:00
Leena Miettinen
cbaa4fc969 Doc: update tutorial
Task-number: QTCREATORBUG-3092

Reviewed-by: Thomas Hartmann
Reviewed-by: Carsten Owerfeldt
2010-11-23 15:52:47 +01:00
Leena Miettinen
c3e80d052a Doc: remove build instructions
Task-number: QTCREATORBUG-3139

Reviewed-by: con
2010-11-23 15:52:46 +01:00
Leena Miettinen
48e475ed96 Doc: fix path
Task-number: QTCREATORBUG-2925

Reviewed-by: Daniel Molkentin
2010-11-23 15:52:45 +01:00
Leena Miettinen
eed35e5d4e Doc: building projects in debug mode for debugging
Reviewed-by: Kai Koehne
2010-11-23 15:52:44 +01:00
Oswald Buddenhagen
f3b5c98bf5 Merge remote branch 'origin/2.1' 2010-11-23 15:44:58 +01:00
Leena Miettinen
b954eb1990 Doc: modify text because Qt SDK contents have changed
Reviewed-by: Oswald Buddenhagen
2010-11-19 16:23:36 +01:00
Leena Miettinen
eab1b49dcd Doc: fix a link to Qt 4.7
Reviewed-by: Oswald Buddenhagen
2010-11-19 16:23:09 +01:00
Leena Miettinen
33ac00afbe Doc: replace Qt SDK product name with a macro
Reviewed-by: Oswald Buddenhagen
2010-11-19 16:22:14 +01:00
Oswald Buddenhagen
79be54ed8c replace env variable injection with pervasive expando support
do not inject SOURCEDIR and BUILDDIR into the environment of
build steps and run configurations any more.
instead, all custom executable paths, argument lists and working
directories now support the %{sourceDir} and %{buildDir} macros.
this approach is more elegant and more scalable.
2010-11-17 13:19:08 +01:00
Oswald Buddenhagen
0641ed0eaa change Environment::expandVariables() semantics
instead of being os-agnostic, interpret the os-native expansion style,
so it is consistent with proper (shell) command lines.

don't interpret quotes, as this function is meant for expanding isolated
filepaths, where nobody would expect quoting. instead, use the windows
style of simply not doing an expansion if a referenced variable is not
found, which should be good enough - it's rather unlikely that something
which happens to be an expansion of an existing variable is actually not
meant to be one.
2010-11-17 13:19:06 +01:00
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1'
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
2010-11-15 19:03:18 +01:00
Leena Miettinen
8276b23db0 Doc: fix a typo 2010-11-12 11:26:28 +01:00
Leena Miettinen
27a0e6e868 Doc: added a warning about opening ports
Task-number: QTCREATORBUG-3074
Reviewed-by: Olivier Goffart
2010-11-12 11:26:28 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build
... instead of running a sed script over a lot of files on each
version increment.
2010-11-03 17:47:41 +01:00
Tobias Hunger
cf3a418cd8 Fix spelling in comments
Krazy was complaining about those.
2010-11-03 12:45:34 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
Leena Miettinen
b3c2be6e20 Doc - sync up master with 2.1
Apparently, the forward merges lost quite some information.

Reviewed-by: ossi
2010-11-01 19:14:02 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
2010-11-01 12:11:03 +01:00
Francois Ferrand
3b70e944a3 Support new keywords %MONTH% and %DAY% for C++ template file.
Merge-request: 199
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-10-28 12:13:47 +02:00
Leena Miettinen
2be41c4046 Doc: replaced Qt Quick application tutorial
Task-number: QTCREATORBUG-2661

Reviewed-by: Carsten Owerfeldt
2010-10-27 17:45:41 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
hjk
c5f8623b41 debugger: rename Dumper.putItem -> putSubItem, putItemHelper -> putItem 2010-10-26 15:14:06 +02:00
con
060e230040 Add a -settingspath <path> command line option.
Useful for testing.
2010-10-25 18:02:46 +02:00
Leena Miettinen
b135e60eec Doc - update screen shot
Task-number: QTCREATORBUG-2530
2010-10-25 12:09:05 +02:00
Oswald Buddenhagen
35bb61590d Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
2010-10-25 11:27:30 +02:00
Oswald Buddenhagen
49bb852292 fix external doc references 2010-10-25 11:18:06 +02:00
Leena Miettinen
05c24045b0 Doc - Qt Quick Designer UI in more detail
Reviewed-by: Carsten Owerfeldt
2010-10-25 11:00:54 +02:00
Oswald Buddenhagen
9eccc9cd27 update qt help index to 4.7.1
the file is "only" one meg after compression, so it isn't as bad as it
looks. and it is sorted now, so further updates should be somewhat less
wasteful.

Reviewed-by: danimo
2010-10-21 20:40:11 +02:00
Leena Miettinen
009d5cd045 Doc: Maemo development is supported on all dev envs
Reviewed-by: Maurice Kalinowski
2010-10-20 09:50:24 +02:00
Leena Miettinen
07e6f25d93 Doc: update screenshots
Task-number: QTCREATORBUG-2771
2010-10-20 09:50:24 +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
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