feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
70,474 Commits 108 Branches 368 Tags
9815d2ee7e0a8d8ae39ecbc4f54d2d01765600b6
Commit Graph

160 Commits

Author SHA1 Message Date
Kai Koehne
50c3e774bb WelcomeScreen: Show content even for incorrectly capitalized application dir 
Work around QTBUG-17529 by normalizing paths first.

Task-number: QTCREATORBUG-6126
Task-number: QTBUG-28230
Change-Id: Ib7a52c81cf546d022b9db8402e225c8d3c10c0ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-11-29 10:38:28 +01: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
Eike Ziller
68c796e244 Merge origin/2.6 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
 2012-10-05 20:51:31 +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
Eike Ziller
62422de5d0 Remove feedback link. 
The form has vanished and wasn't up to date anymore anyhow.

Change-Id: I40292593e8e705da0b5e47f54ab6c1a519144404
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-05 14:19:27 +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
Orgad Shaneh
cf9895ae01 Fix some memory leaks 
Task-number: QTCREATORBUG-7645

Change-Id: I34253d063a20ebf927bf651cf68af4fe1b71bc89
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-20 09:13:09 +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
hjk
3383a7273b welcome: remove dead code 
Change-Id: I60ff9a96f282e24f492bdf25ec01d53368dca05c
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-12 11:00:10 +02:00
thohartm
7b856ee45e WelcomePage: adjusting minimum size 
Task-number: QTCREATORBUG-6818

Change-Id: I030c38e0cc5e370a8f18f5cefc805a51ec730c9a
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-05-23 12:35:04 +02:00
hjk
cad2966498 use Core::Id for IMode::id and IMode::type 
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-08 10:18:12 +02:00
Eike Ziller
e5e3f91ed2 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
 2012-03-15 15:01:54 +01:00
Thomas Hartmann
1b50cdce5c WelcomePage: turning widgets into a proper plugin 
Change-Id: Ifffaa8f848777f6961b49dff048672b194570fff
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-03-15 12:56:34 +01:00
Thomas Hartmann
9bbfb89953 WelcomePage: adding a minimum height 
Task-number: QTCREATORBUG-7115
Change-Id: I001cf9421f63b9ce44a88f0d274624ff48777ced
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-03-15 12:56:29 +01:00
Thomas Hartmann
6e4aa3f8b9 WelcomePage: add ids to IWelcomePage and allow replacing 
This patch allows replacing specific pages by id() and priority().

Change-Id: Ief0b01e6a43bdc187625c0b7aa97745588322e5e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-06 12:50:02 +01:00
Thomas Hartmann
58ec13d5c4 WelcomePage: adjust minimum width to fit small screens 
Change-Id: Ie2e3eb4d0df8ba73950d4d3c70ab25b9e7f7ab33
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-02 08:58:42 +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
Thomas Hartmann
945d7092d1 WeclomePage: no ugly frame 
Change-Id: Ia2012ffcbffeb0bec124ed666eee2d79d79e05ce
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-02-10 17:09:37 +01:00
Thomas Hartmann
d74d03259b WelcomePage: use native Utils::StyledBar instead of border image 
The native StyledBar follows the color theme.

Change-Id: I69983439e299376fe116984ca672ea34ecbceb87
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-02-08 13:47:58 +01:00
Thomas Hartmann
b88c0de6f1 WelcomePage: adding a ScrollArea around the welcome page 
This allows proper scrolling if the Qt Creator window is too small.

Change-Id: I1053a9d6b258fc8798b932cc306eb23b76269fad
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-02-07 16:55:51 +01:00
hjk
2df4cb21fe Core::ModeManager: make some functions static 
Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-27 14:52:24 +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
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
Eike Ziller
e583422cbf Still start up in welcome tab initially and if it was the previous tab 
Amendment to fe068869b9

Task-Number: QTCREATORBUG-6803
Change-Id: Ibf93ff87fc535133b87d8fdc51c2bce4da77ab76
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-01-18 12:12:38 +01:00
Thomas Hartmann
91e23a4bda Welcomepage: remove rss feed 
MultiFeedRssModel gets removed since it is not used anymore.

Change-Id: I955e18cc3abb55468b1afdaf9785f74f4b522357
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-01-17 13:04:19 +01:00
Alessandro Portale
fe068869b9 Workaround QtDeclarative crash QTBUG-23445 
Just hardcode the initial WelcomeTab to 1

Task-Number: QTCREATORBUG-6803

Change-Id: I735d18dd3abb55468b1afdae9785f74a4b522345
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-01-17 11:18:35 +01:00
Friedemann Kleint
274d830148 Compile WelcomeMode with QT_NO_CAST_FROM_ASCII. 
- Add missing QLatin1String
- Replace QString::left() by QString::truncate()
- Sanitize eed model code

Change-Id: I3c3b71d8395b7019db662b8aaecf7d1647881a80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-13 11:16:11 +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
7bfde77d7c s/error_message/errorMessage/g 
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 13:06:52 +02:00
hjk
e684960523 core: remove usages of Core::ICore::instance()->modeManager() 
The function is still there but should be remove in my opinion.

Change-Id: I739fe942e74f459faccb80b5bcb8a5721c6bb9bf
Reviewed-on: http://codereview.qt.nokia.com/4200
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 15:23:45 +02:00
Daniel Molkentin
9743b43663 Make Components installable. Fix Shadow Build. 
Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-03 16:12:35 +02:00
Daniel Molkentin
94055458ad WelcomeScreen: Clean up tag browser 
- Always show tag browser button
- Make tag browser button a toggle (popup semantics)
- Remove "Clear" Button

Change-Id: Ic1f6894103fdc14973c230764ffb06574dd1897b
Reviewed-on: http://codereview.qt.nokia.com/2048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-22 18:29:50 +02:00
Daniel Molkentin
26851ec3fa WelcomeScreen: Implementing proper search lexer/parser for the lineedit. 
Now copes with quotes and "tag:" prefixes.

Change-Id: I348e533ab290242fd05a034a2912cc95f0a9a3da
Done-with: Roberto Raggi
Reviewed-on: http://codereview.qt.nokia.com/2038
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-22 18:29:40 +02:00
Daniel Molkentin
cd9fceba3a WelcomeScreen: fix Regression 
Dropping files on the welcome screen would not open them.

Change-Id: I8ea6b4a55abdec47e40fdeb02d97f45d22db2fb1
Reviewed-on: http://codereview.qt.nokia.com/1992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-22 15:47:51 +02:00
Daniel Molkentin
49b5556921 Refactor: Move NAM to utils, rss model to welcome. 
Change-Id: I0dddedd820e75df05c3a028e7fbb02b642c79659
Reviewed-on: http://codereview.qt.nokia.com/1902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-21 08:30:58 +02:00
Daniel Molkentin
456263e5fa Silence (false) warnings from QtDeclarativeEngine 
Change-Id: Ice8b6624c6aed41869617adaae59a509eaea7268
Reviewed-on: http://codereview.qt.nokia.com/1892
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:26:02 +02:00
Friedemann Kleint
ec7525beaf Remove last traces of the WelcomeModeTreewidget. 
Change-Id: I22ab22c5ed053a3f24ac3f08ca83fa600be98370
Reviewed-on: http://codereview.qt.nokia.com/1579
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-13 12:04:05 +02:00
con
8dd37bd5b3 Welcome page adaptions. 
Remove title and let the tabs span only the part that it switches.

Change-Id: I20c7f05fe11dbc71eea5487b918770236cfd748d
Reviewed-on: http://codereview.qt.nokia.com/1313
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-07 17:24:08 +02:00
Daniel Molkentin
7f2af785f9 Welcome Screen: Don't try to load FDO icons when not on linux 
Change-Id: I5bfaf78dddb27c42ad515f9506857dace571efd4
Reviewed-on: http://codereview.qt.nokia.com/1009
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-01 16:17:31 +02:00
Daniel Molkentin
b18ef1ffb2 WelcomeScreen: fix components imports on Windows 
The path-based loader in QML is broken there.

Change-Id: I390370ca098e288f6e241c526e068a70f17d676f
Reviewed-on: http://codereview.qt.nokia.com/947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-30 17:24:49 +02:00
con
42288b18f4 Fix upper bar in welcome mode. 
Change-Id: I83c5a7a0dcb5dab7cd428c6131b12abb140829b2
Reviewed-on: http://codereview.qt.nokia.com/889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-29 12:20:20 +02:00
Daniel Molkentin
497dd323ea Introduce QML-based welcome screen using desktop components 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 00:31:47 +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
hjk
cf1571be17 welcomemode: disable accidentally enabled debug output 2011-04-14 11:39:42 +02:00
hjk
afdf1e69f8 welcome: simplify plugin code 2011-04-14 11:15:08 +02:00
hjk
ba52d6725b welcomemode: simplify WelcomeMode 2011-04-14 11:15:08 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00