Commit Graph

128 Commits

Author SHA1 Message Date
hjk
a1034af2e8 Core: Mark shortcut conflicts in keyboard settings input box
Task-number: QTCREATORBUG-6

Change-Id: Ife1f97d24733814e7512dd8bc6584a1d72f66fa8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-26 12:22:11 +01:00
Falko Arps
5925be6fe5 Doc: Added some documentation
...to ioutputpane, inavigationwidgetfactory, ioptionspage and
removed now redundant comments

Authors:
    Falko Arps <fjarps@aol.com>
    Sven Klein <klein.sven@gmx.de>
    Giuliano Schneider <gs93@gmx.net>

Change-Id: I49651dfd4304a2e9a0ba2262a16f812d1fca773e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-28 13:06:25 +01:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 07:43:00 +01:00
Orgad Shaneh
f47c101b8b Revert "EditorManager: Fix crash when closing an editor upon activation"
Deleting an editor while currentEditorChanged is apparently not a good
idea.
Use a queued connection instead.

This reverts commits 243a625961,
447c4ed37f,
d9602ca550 and
3103487038.

Change-Id: Iccbee25fb77714963faa6f7184d1f5f53ed348a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-08 17:09:55 +02:00
Nikolai Kosjar
3103487038 Tests: Move TestDataDir into plugintestutils.{h,cpp}
Change-Id: I76d5e421258eda85907e56762a59894ce7f84f13
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-02 10:25:07 +02:00
Eike Ziller
a0b2d10822 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppquickfix_test.cpp
	src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb
2013-10-01 10:04:18 +02:00
Nikolai Kosjar
d9602ca550 CppEditor/CppTools: Fix plugin tests.
Starting with commit 243a625 EditorManager::closeEditors() does not
delete the editors anymore, but calls deleteLater(). When the call
returns, all kind of checks fail since the editor widget destructor was
not yet called.

Fixed by providing and calling Core::Tests::closeAndDeleteEditors(),
which explicitly sends QEvent::DeferredDelete to the widget.

Change-Id: I3287abbe74ccf7d7a18b997a847701c8be17cb55
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-09-30 12:13:28 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
2013-09-27 10:44:32 +02:00
Leena Miettinen
ac363113a1 Doc: move icorelistener docs from header to source
Edit for language and style.

Change-Id: I6f22ae90e95537282e4833ca90775683e76e26cf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-09-26 13:59:43 +02:00
Christian Kandeler
72d173829c Remove superfluous include paths from project files.
A lot of our build system files specify unneeded include
paths. These roughly fall into the following categories:
    a) Paths that are already set in more general files
       such as qtcreator.pri.
    b) Paths that serve no purpose at all, possibly
       left over from earlier versions of the project.
    c) Paths that act as workarounds for wrong include
       statements of the form '#include "xyz.h"', where
       xyz.h is not in the same directory as the including
      file.
This patch removes such path specifications and fixes the offending
include statements from case c).
Tested on Linux, Windows and OSX with qmake and qbs.

Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-02 17:28:17 +02:00
Nikolai Kosjar
6ac341467d Tests: Extract TestDataDir to the coreplugin
Change-Id: Ie290c07c07c13134a57f328e9ae876b2af6974db
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-20 14:19:08 +02:00
Radovan Zivkovic
f6fc78eaea Dialog that prompts to add files to VCS is now resizable.
Change-Id: I8b440c76255b0cd2b952539ad4945443e293a661
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-15 14:22:45 +02:00
Eike Ziller
7b1941c792 OpenEditorsModel API: Use 'document' more where is about documents.
Rename OpenEditorsModel to DocumentModel.
In the DocumentModel also make the distinction between "restored"
document (i.e. just info about file name, display name, id), "opened
document" (i.e. document with IEditor and IDocument), and "document"
(which refers to any).

Change-Id: I01ebe10ec84aab5fe81e54be6bec14f653f28771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:46:19 +02:00
Eike Ziller
4a596c8eee Remove script manager and script debugger engine.
Doesn't really serve a purpose any more.

Change-Id: I8c3bc11bf7b05a15eafd2a22456a40b270cefadf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-01 12:01:11 +02:00
David Schulz
6c12a06029 Editor: Added Dialog for read only files.
Task-number: QTCREATORBUG-2851
Change-Id: Ic47a5a1833650e31b4e27d0a01259d6b398a6415
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-08 10:16:11 +02:00
Oswald Buddenhagen
06acd82ada derive TARGET from QTC_{LIB,PLUGIN}_NAME
the information is redundant now

Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 14:37:56 +02:00
Oswald Buddenhagen
9631fb88cf centralize assignment of TEMPLATE = lib
Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 17:13:17 +02:00
Oswald Buddenhagen
7ce3362288 automatically include libs' and plugins' _dependencies.pri files
Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 12:19:31 +02:00
Oswald Buddenhagen
70efd3906d remove redundant library dependencies
the respective _dependencies.pri files already list them.

Change-Id: I2008abdd043bf3c8738035971b0cbbfe57b02ba2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-27 16:20:35 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Orgad Shaneh
1cba4a5af3 Core: Build with QT_NO_CAST_FROM_ASCII
Change-Id: If8e5d9ce875f8467a7699b791e5ec962baf8ff38
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-21 08:32:35 +01:00
hjk
8011a1646c EditorManager: OpenEditorsView: Remove unneeded one-cell layout
Change-Id: I063b00779e5acbfb307308d2107616990f0da010
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-12 11:18:25 +01:00
Eike Ziller
1d0b58cd00 Fix installation of desktop icons.
The icons are referred to with the name QtProject-qtcreator in the
desktop file.

Task-number: QTCREATORBUG-7955
Change-Id: Iaf6e270acdf0ac3259169dc39943bc78e33e0d96
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-08 16:18:35 +02:00
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-09-25 10:14:51 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00
Orgad Shaneh
1faea8a0b3 Read-only file dialog: Use VCS terms if applicable
Also add keyboard accelerators

Change-Id: Icea8af6af7e5d94623ba7782c375977bbab17f22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-04 16:02:23 +02:00
hjk
b9c7456486 core: adapt to changed syntax to include help in Qt 5
Change-Id: Ia821f870c16518f016c78fcf25dda30889a07122
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 15:24:50 +02:00
Friedemann Kleint
506df46f0b Fix linking of the core plugin on Windows.
DestroyIcon needs user32.dll.

Introduced by e0f16c3093 .

Change-Id: I636d1741a6fa7fb7eb35e51a513ad88950f606f6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-07-30 12:47:05 +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
Konstantin Tokarev
67c4788755 Moved CommandButton to Core and made some improvements to it.
Added constructor taking Id, use command description if toolTipBase
is not set.

Change-Id: I56d774e9c194c6f1eb90583f4a13ed75db540ba3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 14:11:33 +02:00
Friedemann Kleint
ea96c245ce Fix compilation with Qt 5/Windows.
- Adapt to qpa change,
  qtbase:36547f4eff44361f7a6acd0cff107c0e47561f93.
- Implement the progress bar icon for Qt 5/Windows.

Change-Id: I42def27fb5e05a6227ce56dd580a5e669d211855
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-09 16:45:59 +02:00
Tobias Hunger
1cc3a5ecd9 Core: Clean up context
Move the context code into its own implementation file (from id.cpp)

Change-Id: I5e487e0ab0a9b3a33ef32f2d5b7a5d703bded099
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-03 13:28:26 +02:00
Eike Ziller
f10ae79263 Move ieditorfactor.cpp and fix qbs build.
Change-Id: I6d1f6bbbc3fef66705b6f0e913857517d125dd1b
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-19 17:49:26 +02:00
Konstantin Tokarev
ec38c829a7 Added default implementation for IEditorFactory::open().
This change allows to avoid massive code duplication along editors.

Change-Id: Ifdc6ae4b44ab399d34193ab8dddfa1f76d65ad11
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-18 12:15:56 +02:00
Eike Ziller
fe9faa8f6f added MacFullScreen class to enable Mac OS X Lion full-screen feature
Done with Max Desyatov<max.desyatov@gmail.com>

Change-Id: I2c3ff188b5f05dc3b8ec106fec0db3766b43a205
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-16 10:25:18 +01:00
Kai Koehne
a2d3d7f3bf Move EventFilteringMainWindow to utils
Also rename it to AppMainWindow. We add some more functionality to
it in following patches.

Change-Id: I752ccd07759eaaf6a2e96ec758e35b595bf788a2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-15 10:21:43 +01:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-20 13:32:49 +01:00
Friedemann Kleint
622cac50f4 Move QtConcurrent library into Utils.
It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-09 12:33:10 +01:00
Friedemann Kleint
1d1d2f0b74 Compile with Qt 5.
- QtQuick1 renaming.
- Start on qtconcurrent split (pending renaming of Qt Creator's
  qtconcurrent library).
- QWinEventNotifier is a public class in Qt 5.
- Metatype system: Classes need to be known.

Change-Id: I5582e7cc2777bf791a08b049262217055769c80f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-02-08 15:47:00 +01:00
hjk
0fbd7f320f Core: make ICore interface static
This mainly serves two purposes:
(a) it saves a function call in ICore::instance()->foo() vs ICore::foo() at runtime
(b) it saves typing and reduces line noise when reading

It's also (mostly) source compatible, as ICore::instance()->foo() remains compilable.

Change-Id: Icf7be0bce17fefe3560473534a8991ff79cbecc3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-24 15:20:11 +01:00
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set.
If the feature set is not satisfied by the available Qt Versions,
the wizard is not shown in the create file/project dialog.

Every Qt version can define the provided feature set in availableFeatures()
defined in BaseQtVersion.

Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 15:13:52 +01:00
Daniel Molkentin
552db99357 Revert "Enable Lion-style fullscreen mode for Creator."
Breaks with Qt 4.7.

This reverts commit f27a916024.

Change-Id: I52e64dbd0e1602d400c83e32f4c8e2cf81d88d3f
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-12-20 19:08:37 +01:00
Morten Johan Sorvig
f27a916024 Enable Lion-style fullscreen mode for Creator.
Change-Id: Ib44cdd432da7b4609026e211d8c43088d883621a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-06 11:05:32 +01:00
Friedemann Kleint
b0eff051c1 Add Qt 5 libraries to .pro files.
Make Qt Creator compile with Qt 5 after using fixqt4headers.pl.

Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-24 12:02:30 +01:00
Marco Bubke
72056e3570 Wizards: Refactor GeneratedFile in a extra file
Change-Id: I58f7053405c79774154c2f0447944533e6b10152
Reviewed-on: http://codereview.qt-project.org/4685
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-13 09:52:40 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-08-31 13:48:00 +02:00
Friedemann Kleint
bd5a1a9bce Extract Core::TextFile from TextEditor::BaseTextDocument.
Use it in BaseTextEditor and Designer to preserve CRLF
of the files.

Task-number: QTCREATORBUG-5901
Change-Id: I7599ce78649a3b09f2e5118d02f8cbf3db27ed31
Reviewed-on: http://codereview.qt.nokia.com/3591
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-26 08:23:16 +02:00
Friedemann Kleint
2f92eae7bc Utils/Coreplugin: Clean headers.
Change-Id: I1e0d432127651622d40ff990e1866eac9fac46a0
Reviewed-on: http://codereview.qt.nokia.com/3091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-17 12:58:38 +02:00