feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,824 Commits 108 Branches 368 Tags
622cac50f46ff2940a02527c75b9bed4589f9988
Commit Graph

78 Commits

Author SHA1 Message Date
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
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
hjk
b0b105d575 ProjectExplorer: make currentProject static 
This saves one function call compared to the instance()->currentProject()
pattern and is typically less to type on the caller site.

Change-Id: I65568f30205fc90e2aaca7e8e7f0192241df8c85
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 19:20:13 +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
Daniel Teske
f05c27537e CMake Settings: Make cmake executable field grow. 
Task-number: QTCREATORBUG-6791

Change-Id: I1e3df08a2217c105b3c905e3ea4cd9b960353396
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-13 15:25:06 +01:00
Daniel Teske
97dc1d4ab4 More robustness in reading .cbp files 
Instead of choosing the first one, choose the most recently modified one.
Also smallish fix to the title if no .cbp file exists

Task-Number: QTCREATORBUG-6553
Task-Number: QTCREATORBUG-6532
Change-Id: I34e2d7ca6d8242356e92099ed29ca0f0a4a11574
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-16 17:47:47 +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
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
Daniel Teske
4e41308a0f Better error feedback on Open project 
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995

Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-05 15:10:01 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
dt
dd59a14936 CMakeProject: Fix wrong slots 
We never noticed that we had run cmake

Reviewed-By: hunger
 2011-04-13 13:39:06 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
1738d08ffc projectexplorer: move project{Context,Language} from IProjectManager to Project 
Reviewed-by: dt
 2011-04-12 12:46:26 +02:00
Jarek Kobus
798225ce0a Update source strings 
Reviewed-by: Pawel Polanski
 2011-03-31 09:58:19 +02:00
dt
f4ca6959c4 CMakeProjectManager: waitForFinished() 
silences a qt warning.
 2011-03-10 15:38:26 +01:00
dt
abedeeb90d CMakeProjec: Add "Run cmake" to Build menu and context menus 2011-02-23 15:52:56 +01:00
dt
51ddf10aa1 CMake: Initilize hasCodeBlocksGenerator to false 
Task-Nr: QTCREATORBUG-3740
 2011-02-15 15:16:59 +01:00
dt
35ce2acd7e CMake: always fallback to path cmake 
We used to only fallback at start time from a invalid/empty setting
to the cmake in path. Now we do that even if the setting is later
edited.

Task-Nr: QTCREATORBUG-3739
 2011-02-09 14:25:01 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
con
773343f396 Delay widget creation of options pages till their category is shown 
Also add the alternative way: IOptionsPageProvider, which states
a category, and is asked for a list of options pages for that
category when it is shown.

Task-number: QTCREATORBUG-3131
 2010-12-06 11:18:58 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling 
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
 2010-11-17 13:19:07 +01:00
dt
30044e842f CMake Run Page: Colorize output and disable finish on cmake error 
Task-Nr: QTCREATORBUG-2592
 2010-10-04 17:53:15 +02:00
Tobias Hunger
f06512d5f7 Use ExistingCommand in PathChooser where it makes sense 2010-09-24 16:35:09 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00
Friedemann Kleint
cb23999fbf Add error handling to QProcesses run at startup. 
Give warnings about failures to be able to fix things/timeouts on
slow machines. Pass on arguments correctly on Windows.
Make sure processes are killed on timeouts.
 2010-09-08 15:22:58 +02:00
dt
dd0978796e Also make ProjectLanguage a proper context 2010-07-02 14:01:24 +02:00
dt
0801047287 Make project context a Core::Context 
Also properly initialize m_projectContext in Qt4Manager, fixing the
disabled "Run QMake" action
 2010-07-02 14:01:24 +02:00
Friedemann Kleint
2a6f1df168 Fix MSVC10 compiler warnings. 
Reviewed-by: dt
 2010-06-21 12:05:54 +02:00
Robert Loehning
77558abc32 Fixed translation of "Projects" 
Reviewed-by: dt
 2010-06-16 17:30:18 +02:00
Thorbjørn Lindeijer
662b27153d Removed redundant group boxes from options dialog pages 
Reviewed-by: Jens Bache-Wiig
 2010-04-13 17:33:36 +02:00
Thorbjørn Lindeijer
cdf6b22821 Moved CMake settings page under Projects category 2010-03-26 17:47:31 +01:00
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories 
Some categories do not have icons yet, unfortunately.
 2010-03-26 17:47:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
81f14bb270 Fix some code scanning issues. 
QString: Use QChar/char where appropriate, do not use QString::null
 2010-02-02 17:09:41 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3' 
Trailing whitespace removal re-applied manually.
 2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace 
doing it in 1.3 as well to avoid possible later conflicts
 2010-01-29 21:33:57 +01:00
Tobias Hunger
592e494d1a Fix typos 
Reviewed-by: thorbjorn
 2010-01-11 10:26:13 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers 
Reviewed-by: thorbjorn
 2010-01-11 10:26:12 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Friedemann Kleint
a8ac34c347 Options: Sort by category, id. 
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
 2009-11-27 16:12:12 +01:00
Friedemann Kleint
65e11062bb Polish the settings dialog. 
Add a title label to the pages. Use QGroupBoxes throughout.
Extend SavedAction to work with checkable QGroupBoxes. Polish UI files,
use common layout for VCS plugins. Performance: Apply only visited
settings pages. Add search keywords.

Task-number: QTCREATOR-26
 2009-11-24 15:05:02 +01:00
Friedemann Kleint
e4a7792d6e Options dialog: Further polishing. 
Task-number: QTCREATOR-26
 2009-11-20 16:55:23 +01:00
dt
1253c55d56 Fix a race in CMakeProjectManager::createXml 2009-10-21 13:45:49 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory... 
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
 2009-09-25 11:35:44 +02:00
dt
261796c3c6 If no cmake executable is specified or a invalid path, ask the user. 
Directly in the wizard and save that to the settings. Also give feedback
if a wrong path was entered.
 2009-09-23 14:33:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00