feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
24,422 Commits 108 Branches 368 Tags
68157e50f39b6dd9a5cd062e65bf594e857d2548
Commit Graph

103 Commits

Author SHA1 Message Date
Andre Hartmann
68157e50f3 Qt4ProjectManager: Whitespace fixes. 
Change-Id: Ia1d31e4f93c4af70a1b8628572ef07fa7ee03f73
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-06-06 11:28:26 +02:00
Orgad Shaneh
5c23c44ed0 Qt4PM: Support "Build File" for debug_and_release configurations 
Task-number: QTCREATORBUG-106

Change-Id: I9aef17f8b57051ee4b7d22cc4e454d453ea4c821
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-18 14:14:25 +02:00
Konstantin Tokarev
406a3d5f51 Don't build current file when build of subproject is requested. 
Change-Id: I0432c5d90fa6eb762745f458693747383cf5b0d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-14 13:54:17 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-11 13:51:14 +02:00
Orgad Shaneh
72bf41b40f Qt4PM: Build current file 
Task-number: QTCREATORBUG-106

Change-Id: I3511f57b9128073104f6691a469f9c54d64138c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-07 16:39:18 +02:00
Orgad Shaneh
70bda7c3ba Qt4PM: Function reordering, member initialization 
Change-Id: I7091595610e59281468c2fc4c0495121a8ed7881
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-02 11:26:13 +02:00
Orgad Shaneh
c1104a8c36 Qt4PM: Fix typo 
Change-Id: Ib0eafa87bf2da194e09f11d367116a86a1df2f28
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-05-02 10:35:55 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects 
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-25 11:49:19 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style 
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-17 09:53:44 +02:00
Friedemann Kleint
b03dbee784 Fix warning about use on unitialized variable, potential crash. 
Change-Id: I69bce05bb758b78f5cc7776a698ebcac509844dd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-13 10:40:37 +01:00
Daniel Teske
3a1ae4e1e4 Avoiding crash if can't find an valid tool chain 
Change-Id: I5a1242ede5823d77b2c1f44cdb1b4911694f040e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-12 11:15:19 +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
Tobias Hunger
83085439f3 Support multiple mkspecs per tool chain 
This is necessary to handle Qt 5 moving mkspecs out of unsupported.

Task-number: QTCREATORBUG-6862
Change-Id: I193e3d16467773a2a714ef44f8d441d2d2395801
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-09 15:57:29 +01:00
Daniel Teske
e3d14f7c39 Make Open Project wizard skippable 
Task-Nr: QTCREATORBUG-6063

Change-Id: Ieace3e9e68b4e0342c35ac7c279f4b0b61076419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-03 09:36:46 +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
Daniel Teske
4e9192fc10 Fix some strings to the Ui guidelines 
Change-Id: I114a30b2278e375cde27fd4be3e8f6791c387400
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-01-20 16:28:37 +01:00
Daniel Teske
2ac162dd2f Coding style: wrongly indented line 
Change-Id: Id8293537f7e608065862483fdbf7f425c09f5fe6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-17 19:47:16 +01:00
Friedemann Kleint
80d3f73319 Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII. 
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-14 21:13:41 +01:00
hjk
443e77a47d Use QByteArray for variable names. 
Less conversions, tighter code, less to type.

Change-Id: I38eb27ca17e6f1d98cdbc41fa003cbedf0f0bb34
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-10 23:55:48 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Daniel Teske
9fe7f65786 Show a more descriptive "Clean" or "Deploy" while doing that. 
Change-Id: I706cf262e655c75f60008f78e660843d57bee345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-09 13:33:45 +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
Friedemann Kleint
d4e1d7c6ad Header cleanup in Qt4ProjectManager. 
Disentangle the covariant returns and introduce
convenience accessors.
Move internal classes away from Qt4Project.

Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc
Reviewed-on: http://codereview.qt.nokia.com/3216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-18 16:50:01 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport 
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-24 18:35:11 +02:00
dt
8e171e0be0 Qt Version refactoring 
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
 2011-05-12 12:23:06 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +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
Jarek Kobus
d34c81a2a6 Add "Add Library" action to project explorer's context menu 
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Task-number: QTCREATORBUG-4127
 2011-04-13 13:56:27 +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
con
3c8786dfcd Fix CurrentProject:QT_INSTALL_BINS. 
This stopped working when renaming the Qt Creator variable.

Reviewed-by: Kai Koehne
 2011-03-22 15:06:55 +01:00
dt
1fe6d0299c Qt4ProjectManager: Run qmake on the right project 2011-03-15 19:05:15 +01:00
con
b40500a7bf Add a generic variable chooser widget. 
The chooser allows choosing variables from a list, and inserting them
into previously focused line edit, text edit, or plain text edit.
Variables are now registered with a description in the variable manager.
Also make the QT_INSTALL_BINS --> CurrentProject:QT_INSTALL_BINS for
consistency.
 2011-02-18 17:15:41 +01:00
con
3ecced27a3 Start implementing "edit in vi" for mac. 2011-02-18 17:15:36 +01:00
con
1d51764103 Variable manager uses "update request" mechanism. 
For now that removes the CURRENT_DOCUMENT variable and derivates.
 2011-02-18 17:15:35 +01:00
Friedemann Kleint
f37d9b55aa L10n: First round of tr()-Fixes for 2.2 2011-02-14 16:37:20 +01:00
Alessandro Portale
162ffcb19e Update html5 boilerplate code if outdated or changed. 2011-02-06 19:32:39 +01:00
Alessandro Portale
38edea5019 Renaming: QmlStandaloneApp* -> QtQuickApp* 2011-02-06 16:23:02 +01:00
Alessandro Portale
58ca05efcd More compact template files update message 
The content of the update dialog is nor shorter and should not
be cropped on OSX.

Task-number: QTCREATORBUG-3135
 2011-02-04 15:05:20 +01:00
hjk
d87ce08880 qt4projectmanager: style 2011-02-04 12:45:32 +01:00
hjk
a4fa2911f0 qt4projectmanager: compile fix on non-windows 2011-02-04 09:44:17 +01:00
Alessandro Portale
efc596170c Refactoring the template code updater. Reusable for html5 
Less static functions, more ploymorphism.
 2011-02-03 19:48:12 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Friedemann Kleint
b606469ae7 Project managers: Remove dependency to Qt Designer. 
(Cmake/Qt4). Use PluginManager invocation facility
for the form class code generation. Do the rest
(testing for form editor, retrieving the editor
contents).

Acked-By: hjk
 2011-01-10 16:33:31 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00