Commit Graph

585 Commits

Author SHA1 Message Date
Orgad Shaneh
75a3728254 QmlJSTools: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I370075ce75682ea11790a8f91339a01fb3c247f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-22 08:53:45 +01:00
Orgad Shaneh
7fa69afa6c Use Core::Id for language
Change-Id: I0077558e9e2cf5aa06ac921cb45224e29aa85c9b
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-22 08:32:44 +01:00
Aurindam Jana
e62a59bd88 Console: Rename to QML/JS Console
Change-Id: I09f7873bc76f1811946ab8bfa1097055e6a89884
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-11-21 17:54:06 +01:00
Christian Kandeler
99f5605baf QmlJsTools: Remove pointless call to QAbstractItemModel::reset().
The effect is already achieved by the calls to {begin,end}ResetModel(),
which is the correct way to reset a model.

Change-Id: I1981f6d488dc8dbf4c7bc111aa6d6774bc2f50e0
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-11-06 15:33:34 +01:00
hjk
6fb3328dbe CppEditor: remove operator() overloads from OverView
Feels less obfuscated.

Change-Id: Ide0ec1f38762038ddbb1eddb4f70f7d6acdf1ff7
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-10-17 11:20:10 +02:00
Aurindam Jana
1d04c4c3df Debugger: Remove the dependence on QmlJSTools
Change-Id: I26765134c19b9a6cf1e7ad26f313e2d4f8faf258
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-09 18:22:00 +02:00
Tobias Hunger
3b80507af3 License changes
Change-Id: Ie8d2adaa2b20473d2e3e16d1f44ad951ff2744be
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 12:23:22 +02:00
Nikolai Kosjar
3e773824bd Fix qbs build.
Change-Id: I18669823c5bd06e288e24afd4925a38ca8480095
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-08 13:29:55 +02:00
Joerg Bornemann
75d2fc887b fix qbs build
Change-Id: I971f19c9b521e97b04b2a06019fd47a105e6260a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-08 10:56:41 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02: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
Aurindam Jana
44a42a8c1a ScriptConsole: Set empty context when not debugging
Change-Id: I63d110cc76e166db44870853fa3b168167f9760b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-05 15:11:36 +02:00
Aurindam Jana
0c990ce2f3 ScriptConsole: Missing Headers
Change-Id: I2090fb58442ae9382220e85515188656f74e7e21
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-10-05 12:23:14 +02:00
Aurindam Jana
9ac25a2932 ScriptConsole: Move from Debugger to QmlJSTools
The console is now a part of qmljstools plugin. The console
appears as an output pane. A dummy QScriptEngine evaluates
expressions when a declarative debug session is not in
progress. During a debug session, the expressions are
evaluated by the debug services.

Task-Number: QTCREATORBUG-7402

Change-Id: Ic2eeac44fb335c706be03b89f8672b0356efe984
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 11:03:01 +02:00
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 10:18:56 +02:00
Nikolai Kosjar
82599d5593 Locator: State language in filter names.
Task-number: QTCREATORBUG-4929

Change-Id: I9b21010d14e27ace13ba7939db6ce4efb4b36435
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 09:07:46 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-03 09:26:34 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
2012-09-27 20:38:57 +02:00
Kai Koehne
74862df789 QmlJSTools: Fix autotest
Remove checking of "TabWidget" element from autotest (got removed
in one of the welcome screen rewrites).

Task-number: QTCREATORBUG-7835
Change-Id: Ic420586eec4195ed8e5de414e88cdf95f451dbd7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-27 11:34:41 +02:00
hjk
1362f0d27b qmljstools: de-noise
De-pimpl qmljstoolssettings, no need to pimpl a simple pointer.
Add using namespace TextEditor. Remove direct instance access.

Change-Id: I6b07d209a387d31735b95bc35e60a49a3ace7ca2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2012-09-24 13:37:35 +02:00
Christian Kandeler
40d919eed8 Support built-in testing infrastructure with qbs build.
I.e. define WITH_TESTS for debug builds or if the respective
environment variable is set.

Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-13 10:46:51 +02:00
Christian Kandeler
3c6f76d16c HostOsInfo: Add some more useful abstractions.
Namely:
- path list separator
- executable suffix
- file name case sensitivity

All of these are duplicated in various places in the current Creator
code.

Change-Id: I86eb4662fa3c2071759bd728cae1aaf7111ae686
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 13:54:48 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 17:00:03 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Kai Koehne
5064933944 Avoid adding the same DEFINE multiple times to the command line
E.g. on MSVC, QT_CREATOR was passed 14 times ...

Change-Id: Ife39267b0d6f2def1706b823abfd0226325437ae
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-21 11:57:22 +02:00
Orgad Shaneh
99aa8007c1 Remove NULL tests for Core::ICore::settings()
It cannot really be NULL

Change-Id: I7231e00754464347dc5750249f751cda7f831930
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-09 13:09:08 +02:00
Christian Kamm
a14ed0793c QmlJS: Update to latest QmlJS parser from Qt 5.
Using qtdeclarative revision c9b7582a2e7ad9fcd03dd999c3b7a16b72803238

Change-Id: I9c942fa04c3fab5ef57b38e13471d0a4e2e8a2bf
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-07-31 11:05:03 +02:00
Konstantin Tokarev
16cf161d82 Changed URL to qt-project.org in pluginspecs.
Also, it's 2012 now.

Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-30 07:44:48 +02:00
Friedemann Kleint
bf980649d2 tr()-Fixes for 2.6.
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
  names, add where applicable to replace
  QCoreApplication::translate().
- Introduce message utility function for the commonly used
  'No tool chain set up for this profile' message to
  ToolChainProfileInformation.
- Introduce message utility functions related to adding files
  to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
  QmlProfiler.

Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-27 17:08:12 +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
Eike Ziller
e3c354d8f2 Make PluginManager mostly static.
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-19 16:11:40 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 11:22:40 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 10:48:04 +02:00
Aurindam Jana
06dc126d7c FindExportsVisitor: qmlRegisterType
qmlRegisterType can also have 2 template arguments i.e. the
metaRevisionNumber. Consider the case when parsing exported
types.

Change-Id: I553f0e361cc9e9c5a88becd50fd72a33cd35a0d1
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-05-07 17:07:37 +02:00
Eike Ziller
2ae6d86e07 Don't add singleton model manager to object pool.
Change-Id: Iffca99867b25500fc77bbcf1e17a50a7cc4cf832
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-04 13:38:11 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 14:32:08 +02:00
Kai Koehne
4d3395b990 QmlDebug: Rename library and (most) classes
Rename the QmlJSDebugClient lib to QmlDebug (shorter names, easier differentiation with the shared/qmljsdebug lib).

Also rename
 - QDeclarativeDebug* classes to QmlDebug*
 - QDeclarativeOutputParser class to QmlOutputParser

To clarify the features,
 - Debugger::QmlDebuggerClient is now Debugger::BaseQmlDebuggerClient
 - QmlEngineDebugClient is now BaseEngineDebugClient
 - QmlDebuggerClient is now QmlEngineDebugClient
 - QDeclarativeEngineDebugClient is now DeclarativeEngineDebugClient

Change-Id: Ie15713730a614c8ab4b637fad0924f95b54e633f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-18 14:31:36 +02:00
Kai Koehne
aca66125de QmlJSInspector: Remove dependency to QmlJSEditor
Change-Id: I6f90bff623437b25887bdd288987c013a45029be
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-16 16:55:54 +02:00
Kai Koehne
04ef376637 QmlJS: Move SemanticInfo from qmljseditor to qmljstools
This will allow us to remove the qmljsinspector->qmljseditor
dependency.

Change-Id: I234cf8645edb614e8b1f559a0f9bb6d43e2254c3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-16 16:55:47 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Takumi ASAKI
fcb825d4f6 Qml/C++: Add finding C++ qmlRegisterUncreatableType calls.
Change-Id: I4e1b87cc247a04236a9c9f157d04b1fc817530d0
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-02 16:19:08 +02:00
Marco Bubke
d3e25481f9 Fix qbs project files
Change-Id: Iae72cd8f65779617dfa3ae03e9c894a95d151e81
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-21 10:58:06 +01:00
Erik Verbruggen
dfd28a1d32 Fix build breakage after making plugins dependent on cpptools.
Change-Id: Iae2c15efe25580fb616bdc3dd4b8ff3581cd481a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-15 15:28:17 +01:00
Erik Verbruggen
f1b2100e34 Move the ModelManagerInterface out of the CPlusPlus library.
Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-03-14 11:46:24 +01:00
Friedemann Kleint
4e83fb7953 Port Qt Creator to the new plugin system of Qt 5.
- Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN
  for Qt 4.
- Generate the Json files for Qt 5 from the pluginspec
  files by using a XSLT sheet.

Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-02 14:13:49 +01:00
Orgad Shaneh
164db0feeb qbs: Cleanup
* Removed utils, extensionsystem and aggregation dependencies
for plugins that depend on Core
* Capitalized Find and CPlusPlus

Change-Id: I505e5f46976f26da47ad778860f103b173668b1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-02-28 08:58:11 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +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
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