Commit Graph

19 Commits

Author SHA1 Message Date
Eike Ziller
d719eebfdc Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
2012-11-30 17:02:35 +01:00
Robert Loehning
a9750d0226 Fix opening in file manager
Task-number: QTCREATORBUG-8174
Change-Id: I9858ff5c24e80ed1f4375b2f4076bc74832bb217
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 13:43:56 +01:00
Aurindam Jana
f3456c8f92 Fix build for Qt 5 configured without -developer-build
This patch reverts 2b0c1fb376 and
affd4b9ce1

Change-Id: I65daf80a0e510f4103c2f2714a3ee583207e53d0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 12:31:34 +01:00
Aurindam Jana
2b0c1fb376 Fix build for Qt 5
QAbstractFileEngine is in a private header in Qt 5

Change-Id: I2f3317e48274392cda853ebf69ed96a662763094
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 10:16:26 +01:00
Eike Ziller
affd4b9ce1 Also use file renaming workaround for Qt5.
QTBUG-3570 doesn't look like being fixed in Qt5.

Change-Id: Icddcd0e98899c9a8ac01b99783bb9450dcbe952b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-28 14:56:36 +01:00
Erik Verbruggen
148867665b Fix compilation on MacOS.
Change-Id: I4960dfed9bb77c02864c59d1c5a7a2238ca7b568
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-21 09:26:19 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Konstantin Tokarev
728579ef52 Added VCS integration to ResourceEditor.
Made add and remove operations of ResourceEditor VCS-aware. Also, remove
operation now can remove files from filesystem.

FileUtils::removeFile() and VcsManager::promptToAdd functions were
extracted from ProjectExplorer to prevent code duplication.
RemoveFileDialog was also moved to coreplugin.

Change-Id: Ia51127288030e52ce9475b369e56ea034dfa5d1e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-19 22:26:47 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Robert Loehning
faf7ba6274 Compile fix for Windows
Change-Id: I0305e78dfc20ce398a06dac32c6368bfa1ec8b63
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-18 13:54:27 +02:00
Konstantin Tokarev
eef043e055 Implemented file rename in ResourceEditor.
Renaming supports version control.

To prevent code duplication part of ProjectExplorerPlugin::renameFile
implementation was separated into FileUtils::renameFile.

Change-Id: I28481bea89d0824339e5db025ceb7216713bd5a0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-18 11:46:54 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC.
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-26 11:06:12 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Eike Ziller
35cad941c9 Remove wrong ellipses.
Task-number: QTCREATORBUG-6538

Change-Id: I9cdeba4c56bc7e8a41f3cad4929b8fde38b9851a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-15 10:39:22 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Robert Loehning
662c66ef6b Moved class FileUtils out of Internal namespace
...because it is being exported.

Change-Id: If2892f8455b7c7fb9a78a8cde27642901ae4bf3a
Reviewed-on: http://codereview.qt.nokia.com/3676
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-29 12:17:31 +02:00
Robert Loehning
738544768b Improved editor menus
Access native filemanager and terminal from Open documents view
and Editor menu

Task-number: QTCREATORBUG-389

Change-Id: Id6cd8839cdbd270a4ac53ccad1ae1db94d48e900
Reviewed-on: http://codereview.qt.nokia.com/2974
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-08-17 12:36:33 +02:00