Commit Graph

1034 Commits

Author SHA1 Message Date
Orgad Shaneh
7f924976e0 QmlJS: Cleanup whitespace
Change-Id: Ifd6ec2a2aa33e1adca5afa8f41c4b4619ed017b5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-05-22 04:54:54 +02:00
Thiago Macieira
d79b47a6b8 Fix warnings in release mode (unused variables)
qmljsimportdependencies.cpp:937:18: warning: variable ‘found’ set but not used [-Wunused-but-set-variable]
findtoolbar.cpp:665:18: warning: unused variable ‘w’ [-Wunused-variable]

Change-Id: I75930fa6f5a7cbb91d9c39e6808f8c3ce913327e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-20 20:52:09 +02:00
Orgad Shaneh
a77e75c36e QmlJS: Fix wrong conditions
Change-Id: I31740bca2b17e635c28af70779334f2b52ddb709
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-05-19 19:17:39 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
2014-05-16 16:54:50 +02:00
Nikolai Kosjar
126e69137a C++: Clarify units of a Token
This will avoid confusion when later more length and indices methods are
added.

In Token:
    length() --> bytes()
    begin() --> bytesBegin()
    end() --> bytesEnd()

Change-Id: I244c69b022e239ee762b4114559e707f93ff344f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-05-15 15:55:38 +02:00
Fawzi Mohamed
a17c231b07 qmljs: correct slot name for properties starting with “_”
Task-number: QTCREATORBUG-12214
Change-Id: Ie8009846ce27d4acbc3e9ad4dd7dda73fde39413
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-05-15 11:10:07 +02:00
Fawzi Mohamed
58489e50a8 qmljs: better defaults, more uniform handling of paths
Uniform handling of the different qml dialects.

Now paths for a given document prefer the project of that document.

For Qt the following sequence is used:
- Qt of the project of the document
- Qt of the active target
- Qt used to run creator

Currently all paths of the open projects are still merged, but that
can be changed.

Change-Id: Id302c13c893b66fbfe24e301602fe69de152eed4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-09 17:13:05 +02:00
Fawzi Mohamed
329b1535c8 Revert "qmljs: better defaults, more uniform handling of paths"
moving to master

This reverts commit 0c46692244def9edb89c2914b9b1e5eff10cb6ce

Change-Id: Ie09f6db02058f4a5539221f1a0cc4f9225f38300
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-07 12:36:38 +02:00
Fawzi Mohamed
307526da40 Revert "qmljs: fix compilation for Qt4"
moving original patch to master

This reverts commit c5b6e6ae1c60cb5692deef0db4c3dfbcf0859a1d

Change-Id: I84153a3aaf3ab5ca670ed62aa62babce5bbd51e9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-07 12:35:46 +02:00
Fawzi Mohamed
e3b3e21eda qmljs: fix compilation for Qt4
Change-Id: Idb3ad6962e74dd7a34f108c6e3c3810d843a3f3a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-05-07 08:44:39 +02:00
Fawzi Mohamed
8b8c5e8fe8 qmljs: ensure that opening an editor always updates the modelmanager
Change-Id: Ia23d9c84240bd2c54b0c331494474d0fa74674e8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-06 14:31:15 +02:00
Fawzi Mohamed
08163f3b9a qmljs: better defaults, more uniform handling of paths
Uniform handling of the different qml dialects.

Now paths for a given document prefer the project of that document.

For Qt the following sequence is used:
- Qt of the project of the document
- Qt of the active target
- Qt used to run creator

Currently all paths of the open projects are still merged, but that
can be changed.

Change-Id: Iacf28d63184c05e2bcdfe0210ec472d2bf140d66
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-06 14:28:40 +02:00
Orgad Shaneh
d750554e63 QmlJS: Remove unused variable
Change-Id: Id5973f9f75f9928db64a91a7c9048226c4557795
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-05-06 09:11:40 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
2014-05-02 10:00:20 +02:00
Fawzi Mohamed
de594fdee0 qmljs: split scan function
allows to more easily scan the various qml dialects

Change-Id: I9f8c44459e05e4658d3814c624e0f07762c83279
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-30 15:12:54 +02:00
Eike Ziller
063b95d970 Use more descriptive progress bar titles
Change-Id: I70450a2aa675d69f820de48dd75909f36051efe0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-28 14:32:25 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines.
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-22 10:06:40 +02:00
Kai Koehne
231c46d102 Fix 'prefered' typo in variable names
Change-Id: I15d65d4bb5a29b546b7a781051c3d641764d527e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-19 11:14:37 +01:00
Kai Koehne
bd1a922b2f Fix detection of language in QmlJSModelManagerInterface
Change-Id: Icdc458b7deab5903fd997051947224f9c8d26945
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-13 17:17:20 +01:00
Fawzi Mohamed
2a9cde9468 qmljs: adding Qml to companion lanaguages of Unknown
Correctly collect qml files when the language is not specified.

Change-Id: Ieebfc543108ddb716479ac4524ef14063dd225ea
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 15:20:26 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Leena Miettinen
f3b9dd5b13 QML JS: fix messages
Fix punctuation and capitalization in messages.

Change-Id: I0de61d8594917a95175e3453ef9343f0d9cd208f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-10 13:14:49 +01:00
Friedemann Kleint
16778f45a5 Fix capitalization of QML in qmljs.
Change-Id: Ia88815313272709e0f2c2954ed94d258647c5726
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-04 16:54:57 +01:00
Christian Kandeler
9141e257f9 QmlJS: Fix qbs build.
Change-Id: I6264b0a50ae87fd18d6a3fe8230e29abf8e77b0d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-20 11:59:26 +01:00
Fawzi Mohamed
13349331e8 qmljs: fixing attributes naming (code style)
Change-Id: I3d5916483b99a8d6839b9cb6b9bde119a9da351a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-19 21:24:34 +01:00
Fawzi Mohamed
d24cb60d48 qml: moving most of ModelManager logic to ModelManageInterface
Currently ModelManager contains lot logic, but as it sits in QmlJSTools
it is not possible to use it in standalone tests.
Moving most of the logic to ModelManagerInterface (and cleanup)
to allow better testing, and refactoring.
This introduces a dependency of the qmljs lib on the cplusplus lib
Also a (small) part of the CppTool::ModelManagerInterface has been
moved to CPlusPlus::CppModelManagerBase to remove the dependency on
CppTools to gather the Qml types exposed from C++.

Change-Id: Icad7fe96dfd0f1a2b1058d82bd98c77c40aa5e9d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-19 21:18:58 +01:00
Fawzi Mohamed
f2ae69b1bf qmljs: qmltypes, added isCreatable, isSingleton, isComposite
Change-Id: I62cd3736de46b25107e5ea5f6d8e8dcafaa5e11a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-18 05:41:16 +01:00
Fawzi Mohamed
1ff5faacea qmljs: improve qmltype parsing error messages
add filename to each error message.

Change-Id: I2b9f550147acfe6993f1e7d878fdda863182a2a0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-18 05:40:34 +01:00
Fawzi Mohamed
10fa9c5c77 qmljs: correctly set Warnings
WarnImperativeCodeNotEditableInVisualDesigner and
WarnReferenceToParentItemNotSupportedByVisualDesigner were still
declared as errors, which made files having them no editable in
designer.

Task-number: QTCREATORBUG-10940
Change-Id: I6edc03634c2d05b74ab0adf62e48fc6d03049d7e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-02-17 17:15:18 +01:00
Orgad Shaneh
7ed1576083 Clean up single namespace forward-declarations
Done using the following ruby script:

Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}

Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-12 09:30:37 +01:00
Eike Ziller
39a29dcfd9 Fix build with msvc2010
override on destructors are not very useful anyhow, but also msvc2010
doesn't like them at all.

Change-Id: I2d5f4b0d6148c5e66d2cba604d305707269d12e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-07 09:26:22 +01:00
Fawzi Mohamed
cbf760686f qmljs: using QTC_OVERRIDE consistently
Change-Id: I37c96397014b7b710aeec629c5e715bba4997766
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-06 14:03:12 +01:00
Eike Ziller
f8461fbbdf QmlJSEditor: Move semantic info updating to document
Change-Id: I804dbd887af1786e7554ec79f94fc8e59db1de5b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-01-29 10:16:10 +01:00
Fawzi Mohamed
a8ea0a0736 qmljs: generalize language treatement
* better support qbs and similar non QtQuick qml languages
* begin to clean and migrate things from ModelManager to
  ModelManagerInterface

Change-Id: Ifa39dc1e4c568e9e21307f4913dcb5989e80420f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-01-28 15:01:00 +01:00
Eike Ziller
cdd19fe6ad Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f
2014-01-20 14:21:46 +01:00
Fawzi Mohamed
6d3939dbfd qml: accept qmltypeinfo with larger minor version
Change-Id: I56559f6d9bd128069e2c270e033c958a6a239c3a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-16 12:54:22 +01:00
Fawzi Mohamed
8772e6e85b qml/parser: update parser to Qt version 5.2.0
Change-Id: I22234b9d99bdebf05309ad79ed3b9233db5cff78
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-15 14:57:45 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Thiago Macieira
a60b89bff4 Remove trailing comma in an enum
qmljsconstants.h(53): warning #271: trailing comma is nonstandard
[and many more]

Change-Id: I2224b7fe6ae1954b27d2b2bfebd469e1ca472f7b
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-12-12 10:17:22 +01:00
Thiago Macieira
5fd58a3252 Remove function acceptIndented that is not used anywhere
Found by ICC:
warning #177: function "<unnamed>::Rewriter::acceptIndented" was
declared but never referenced

Change-Id: I37892d021a4ca9886fd35fea00102d44fa99320f
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-06 22:07:02 +01:00
Thomas Hartmann
caff343769 QmlJS: Fixing warnings
Correcting ImportKey::compare(). The compare function was not stable
and QMap did not work properly.

Done with: Fawzi

Change-Id: I11790215cba6944bf9f04be0c3844b35ea54ea70
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-26 11:34:30 +01:00
Thomas Hartmann
e25f1c5a4c QmlJS: QmlDesigner warnings should be warnings
Task-number: QTCREATORBUG-10898
Change-Id: I6d8a1b1523d72950fad25eb8545c24085552b226
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-25 18:59:20 +01:00
Fawzi Mohamed
4bd3f2a69e qmljs: improve suggestion ordering
change matchStrength sp that a contigous prefix is always preferred

    Task-number: QTCREATORBUG-10638
    Change-Id: I532d93eddae1ad39157ff65e96fc6651200264ab

Change-Id: I1001f5f4b78bac84b8df8ddc4c394c68359f7821
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-25 18:45:26 +01:00
Fawzi Mohamed
30d0eb6325 qmljs: fixing tests
Change-Id: I8f2eaa64f3cb923753234de76f3491d4daa034fa
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-22 21:22:34 +01:00
Kai Koehne
d7ede938e1 Fix wrong header file name in QMLJS
Fix a qmake warning introduced in e1b44e870f .

Change-Id: I8f7913ceabc411044785634d1708fbc035b0a5c4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-21 16:15:32 +01:00
Fawzi Mohamed
ca57a394f4 qmljs: fix import cache
correct update of m_importCache

Change-Id: I70a2c6777c8f0e8df7b130fcff96cd67f83ca3e4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-21 14:56:52 +01:00
Friedemann Kleint
21dd4c8b1b QmlJS: Simplify code, fix MSVC-warning.
qmljsviewercontext.cpp:80: warning: C4715:
'QmlJS::ViewerContext::languageIsCompatible':
: not all control paths return a value.

Change-Id: I22279ef7a43873b9c8f3d73d3826b59d5abaa390
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-20 17:10:40 +01:00
Nikolai Kosjar
cae38634e1 QmlJS: Fix compilation with Qt4
Change-Id: I036f2ccf07b836ecff63a055e3204327d006c0d0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-20 14:48:58 +01:00
Fawzi Mohamed
2fc150b983 qmljs: scan imports
Change-Id: Ied59f5d56c5816d9da57f23a619d604acec76000
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-20 12:27:49 +01:00