feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
53,495 Commits 108 Branches 368 Tags
dbd365afe6f80d76f714f107dad31704f897b9e2
Commit Graph

219 Commits

Author SHA1 Message Date
Eike Ziller
5dd8d7cd9c Editors: Move id() from editor to document. 
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-05 16:27:52 +01:00
Orgad Shaneh
d6d8937625 QmakeProject: Remove unneeded namespace qualification 
Change-Id: I82b00db276149a146a53dd3a22da3d9a5aad498f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-02-26 13:23:08 +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
Daniel Teske
d2a34683a0 QmakeProject: remove duplicates in ::files() 
Task-number: QTCREATORBUG-11292
Change-Id: I48a535303d916cdae22ea2a0cb62ef347b4ccf88
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-01-29 15:52:42 +01:00
Orgad Shaneh
2c5c1605b8 QmakeProject: Support absolute path for TARGET 
Change-Id: I2b90e0581269b76e27edbe2f28dfda75bb4aa0e5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-01-16 17:11:20 +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
Erik Verbruggen
ea1a92484a C++: split defines into project-defined and toolchain-defined. 
So we can ignore possibly problematic toolchain-defines, while can still
unconditionally apply project-defines.

Change-Id: I7cb96f35a963d080011fe888ef71bfc098dd33ef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-10 11:42:41 +01:00
Eike Ziller
0e4de8c108 Merge remote-tracking branch 'origin/3.0' 2013-11-29 11:50:41 +01:00
hjk
692309849f ProjectManager: Use platform slashes in dialog 
Change-Id: If9a3248cb94cf8399865750107116529bb747111
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-11-27 13:38:07 +01:00
Eike Ziller
4538ccb46c Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
 2013-11-15 10:26:57 +01:00
jkobus
c31b03f1d0 Restructure qtquick templates, read them dynamically 
Change-Id: I11dfac8ce8d6b1e68df0151516cdc03247fffe3a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-11 15:27:35 +01:00
Eike Ziller
49b7e95e7f Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
 2013-11-06 14:02:08 +01:00
Daniel Teske
623fc1e902 QmakeProject: Fix crash 
There's no target if the project is in the parsing without configuration
state.

Change-Id: Id21e2ded5b634253267e956accc27715e6562941
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-04 17:03:05 +01:00
David Schulz
ddcb258559 ProjectManager: Update deploy step on project load. 
Change-Id: Ib1247e1389284f793d4803871cfcd174aca5facd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-04 13:20:39 +01:00
Eike Ziller
0ddb6cac29 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
 2013-10-30 13:34:46 +01:00
Tobias Hunger
52a561c915 Qmake: Misc qt4 to qmake renamings 
Change-Id: I47875935101b7560ad64c8a8c27d821c9810b388
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-29 18:37:29 +01:00
hjk
7ce22266de QmakeProjectManager: various renaming cleanup 
Change-Id: I0433317d03aefb8e175f2208ca7ae29fa3e9fa49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-29 18:12:12 +01:00
hjk
d7d27fccbc Rename plugins/qt4projectmanager to qmakeprojectmanager 
This finally renames the plugin itself.

Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-29 17:57:06 +01:00