Commit Graph

14918 Commits

Author SHA1 Message Date
Friedemann Kleint a82d57de8a Qt4ProjectManager/Symbian: Header cleanup. 2010-11-03 10:03:48 +01:00
Friedemann Kleint 4768bb8df2 Qt4ProjectManager: Compile on Non-windows. 2010-11-03 09:17:02 +01:00
Friedemann Kleint 0aaeae97c6 Qt4ProjectManager: Do not include windows.h in qtversionmanager.
Move 64bit-binary detection into Utils library.
2010-11-03 09:05:14 +01:00
hjk 36a10aa26f qtpromaker: add the ability to create a .pro for a binary's sources using gdb 2010-11-02 18:59:03 +01:00
hjk 95c155b5ac qtpromaker: create SUBDIRS .pro files up to a given level 2010-11-02 17:51:59 +01:00
con 7eedf3e6ba Update Mac requirements info. 2010-11-02 17:20:49 +01:00
Friedemann Kleint 68d4d35cae Coreplugin: Header cleanup.
Clean icore.h.
2010-11-02 16:53:56 +01:00
dt a149b70fc6 Qt4ProjectManager: Remove left over debugging output 2010-11-02 16:43:12 +01:00
dt c09c5ec988 Qt4ProjectManager: Emit correct state once on restoring 2010-11-02 16:43:11 +01:00
dt fe4549f775 Revert "hot fix to allow running projects again."
This reverts commit 0d6601e424.
2010-11-02 16:43:11 +01:00
dt ff60fcf29f Revert "Revert "Qt4ProjectManager: correctly set parse state on restoring""
This reverts commit ae6dbf364b.
2010-11-02 16:43:11 +01:00
Christian Kandeler 667d645611 Maemo: By default, strip release binaries.
But never strip debug binaries.

Task-number: QTCREATORBUG-2981
2010-11-02 16:17:41 +01:00
Friedemann Kleint 22f03cbde6 ProjectExplor/Debugger: Header cleanup 2010-11-02 16:14:00 +01:00
Christian Kandeler 220a3d1a37 Maemo: Remove remaining barriers for concurrent debugging.
Pipes and mount points for debugging with on-device gdb now have
unique names.
Also give mount point for deploying via UTFS per-project file name.

Task-number: QTCREATORBUG-2702
2010-11-02 15:08:30 +01:00
Christian Kandeler 88b0e1f6e0 Maemo: Remove some outdated TODOs. 2010-11-02 14:27:19 +01:00
Christian Kandeler 7edc45a23a Maemo: Re-enable package installation via UTFS mount. 2010-11-02 14:27:19 +01:00
Christian Kandeler f2d14996ad Maemo: Add ports gatherer to deploy step. 2010-11-02 14:27:19 +01:00
Christian Kandeler 548df9385b Maemo: Use dynamic port list.
Check whether the ports we need are actually available on the device.
As a side effect, this makes it possible to debug more than one
application at the same time on Maemo.

Task-number: QTCREATORBUG-2702
2010-11-02 14:27:18 +01:00
mae 8415d0faa0 Fix painting order
text on top of seach results on top of find scope on
top of ifdefed out lines.
2010-11-02 13:48:32 +01:00
hjk b4df5861a3 qtpromaker: refactoring 2010-11-02 13:43:59 +01:00
con a757c55870 Fixes restoration of main window geometry.
We were handling it ourselves, now we let saveGeometry and saveState do
its job. This also takes care of making the geometry valid for offscreen
saved states.

Task-number: QTCREATORBUG-1689
2010-11-02 13:41:25 +01:00
Robert Loehning 78fc8e3047 Compile fix
Reviewed-by: hjk
2010-11-02 13:13:15 +01:00
Arvid Ephraim Picciani 51c8491158 fakevim: Fix cursor movement in insert mode on Mac.
Reviewed-by: hjk
2010-11-02 12:37:36 +01:00
con b287b06e41 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2010-11-02 11:34:57 +01:00
con 61f7965bf5 Merge remote branch 'origin/2.1'
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
2010-11-02 11:34:27 +01:00
Friedemann Kleint 5a5d464160 Debugger: Make manual CCDB test compile again. 2010-11-02 11:33:22 +01:00
Thomas Hartmann a4640e361f QmlDesigner: fixes crash
Deleting an items might have a side effect that turns
the qml code invalid. (e. g. alias properties)

We catch this an show a proper error message.

Task-number: QTCREATORBUG-2973
Reviewed-by: Kai Koehne
2010-11-02 11:18:22 +01:00
con d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
con dbb1c5ef77 Merge remote branch 'origin/2.1' 2010-11-02 11:14:03 +01:00
con a031112bef Add auto test for file search. 2010-11-02 11:13:43 +01:00
Friedemann Kleint 77008bc45f Exported Header cleanup: QmlJSEditor
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2010-11-02 11:10:27 +01:00
con 5abfdbc160 Merge remote branch 'origin/2.1.0' into 2.1 2010-11-02 11:10:09 +01:00
hjk afef6dd071 debugger: work around gdb 7.2 quirk in QFlag dumper
Reviewed-By: Friedemann Kleint
2010-11-02 11:07:45 +01:00
hjk 7b6022bea2 debugger: make QFile and QFileInfo visible without top-level inferior call
Reviewed-by: Oswald Buddenhagen
2010-11-02 11:00:31 +01:00
hjk 8df0f12eca debugger: fix dumping of reference targets
Reviewed-by: Alessandro Portale
2010-11-02 11:00:31 +01:00
Alessandro Portale 48d726b37e Remove compile warning on Symbian.
Reviewed-By: TrustMe
2010-11-01 19:25:19 +01:00
Alessandro Portale 2a7336b4d6 Move hide implementation of conditional show()
...and do not call it show(), because that is the signature of
a non-virtual base class function. showExpanded() sucks as name,
and hjk, who reviewed this is not convinced.
But showExpanded() is still better than show().

Task-Number: QTCREATORBUG-2979
Reviewed-By: hjk
2010-11-01 19:19:32 +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
hjk 29b6b2feba Add a little tool doing the job of 'qmake -project'
This creates a .pro from all "source" files below a given directory.
As I'd like to use Qt Creator as tool to quickly inspect and navigate
"alien" codebases a way to easily set up dummy .pro files is needed.
qmake -project takes far too long on projects of the size of Qt itself.
2010-11-01 17:30:33 +01:00
Friedemann Kleint 0ad2d077b9 Exported header cleanup: Separate out CppQuickFixCollector. 2010-11-01 17:04:48 +01:00
Alessandro Portale 7d622f1145 Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
  not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources

Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
2010-11-01 17:03:46 +01:00
Friedemann Kleint 6063fb84c2 Fix exported headers in Core and TextEditor.
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
2010-11-01 16:29:45 +01:00
con beaff08200 Fix test compilation on Mac by using rpath. 2010-11-01 15:10:44 +01:00
con 49b86e7717 Mac: Use rpath instead of executable_path.
Because executable_path and loader_path are just too inflexible for some
stuff. The rpath is supposed to be set to the Qt Creator app's Contents
folder.
Compiling on 10.4 now requires to enter compatibility mode via
QTC_TIGER_COMPAT env variable or TIGER_COMPAT_MODE qmake variable.
2010-11-01 15:00:25 +01:00
con 59c301a8c8 Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget.
qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues.
2010-11-01 14:55:37 +01:00
Friedemann Kleint 724f67b311 Open File: Make it open in project directory if one is set.
Reviewed-by: dt
Task-number: QTCREATORBUG-2947
2010-11-01 14:29:25 +01:00
Friedemann Kleint 6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
dt 34e2e491f4 ProjectExplorer: Fix Open in graphical shell/terminal on virtual folders
Use the same code that is used for figuring out a good directory for
adding new files.

Task-Nr: QTCREATORBUG-2682
2010-11-01 12:39:56 +01:00
Oswald Buddenhagen 9248240ea0 update chinese translation for 2.1
this is a team work by the following people:
  Beaver Xu <xtfllbl@hotmail.com>
  cch123 <cao1988228@163.com>
  shiroki <shiroki@cuteqt.com>
  Rei <chloerei@gmail.com>

Merge-request: 210
v2.1.0-beta2
2010-11-01 12:27:37 +01:00
Oswald Buddenhagen 649c52bef3 include region-qualified languages into the list 2010-11-01 12:27:37 +01:00