Commit Graph

1907 Commits

Author SHA1 Message Date
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Thomas Hartmann
f864df8fd2 Wizards: usablitity fix
If the virtual projectKind item has no children it is deleted.

Change-Id: I5f86b18043ed937b3f38c8e1591a529af934043a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-10 14:18:32 +02:00
Eike Ziller
9ec6e9f7e0 Merge remote-tracking branch 'origin/2.5' 2012-04-05 18:24:26 +02:00
Daniel Teske
10438d2e9d BaseTextMark: Support renaming files
Change-Id: I8d712f76fca5d8f5ecad70f1485228e21c00648d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-05 16:47:15 +02:00
Eike Ziller
c814538d95 Merge remote-tracking branch 'origin/2.5' 2012-04-04 16:20:10 +02:00
Orgad Shaneh
06aa0363b0 Qbs: Libraries capitalized and relocated in bin on Windows
Change-Id: I994027ef50f5f7c4ff1b2bef06d9f8db037243e4
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-04 14:16:12 +02:00
Daniel Teske
6334684824 New File Dialog: Choose right default project for adding
So far we used a heuristic that prefers .pro files in the same directory
as the new files. That fails if there are multiple .pro files in the
same directory. So instead introduce a mechanism to pass extra data
through the wizard.

Task-number: QTCREATORBUG-7157
Change-Id: I615f7292e16a0a6cb1e84f090016879f1038409f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-03 14:11:47 +02:00
Eike Ziller
078d570721 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd
2012-04-03 10:03:52 +02:00
Orgad Shaneh
34ec82987f Doc: Some QString->Id corrections
Change-Id: I43c707cb3d27ac706052f8e46f0f1ef8c86e644e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-02 09:30:46 +02:00
Eike Ziller
63244127a8 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/symbianutils/symbianutils.qbs
	src/libs/utils/utils.qbs
	src/libs/zeroconf/zeroconf.qbs

Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
2012-03-29 17:58:34 +02:00
Orgad Shaneh
46a6e9e9e8 Qbs: Fixes for Windows compilation
Change-Id: Ia392b8dc566e1d4ffadd67c09a30ace7f64b9f3f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-29 11:22:48 +02:00
Thomas Hartmann
bbd5d2ddfe Wizards: allow forcing of first letter to be a capital letter
This adds a flags that enforces capitalization of filenames.

Change-Id: Ie6660f1985a2e96fd68549c5ced1b37c33f064cc
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-26 16:20:46 +02:00
Orgad Shaneh
ebeb5b7f49 FileIconProvider: Fix doc
Change-Id: I7857792f7f8c27bc7d6004eb6a63c10449144efa
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-03-26 09:52:53 +02:00
Eike Ziller
6d1ac2e04c Mac: Fix for compilation with 4.7.4
qglobal from 4.7.4 doesn't define MAC_OS_X_VERSION_10_7

Change-Id: Ia152108b52b92b65916002df76065e4eb95dc8a0
Reviewed-by: Bill King <bill.king@nokia.com>
2012-03-26 08:58:28 +02:00
Oswald Buddenhagen
dbcaadd8af Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76
2012-03-22 15:09:50 +01:00
hjk
4a075c3f0d general settings: compile fix msvc
Change-Id: I377c269db97906796703df0881eb93d16ca95f5d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-21 18:07:02 +01:00
hjk
baab3cb421 Some pixel shifting in split icons
For the record: I still like the 2.4 one better, but this is progress.

Change-Id: I56de3c5806d476e72d57dcf5dc2e1746a8f10f83
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-21 13:40:52 +01:00
Eike Ziller
7931159c09 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
	src/libs/zeroconf/servicebrowser.cpp
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qmlprofilerengine.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.h
	src/plugins/qmlprofiler/tracewindow.cpp

Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
2012-03-21 09:57:56 +01:00
Eike Ziller
8e8168fc5c Fix reloading behavior of image viewer.
The image viewer is not able to save, so we should not ask.

Task-number: QTCREATORBUG-5966
Change-Id: I947520d7450704abda8395e8aaae56dfe7842328
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-16 13:40:27 +01:00
Eike Ziller
fe9faa8f6f added MacFullScreen class to enable Mac OS X Lion full-screen feature
Done with Max Desyatov<max.desyatov@gmail.com>

Change-Id: I2c3ff188b5f05dc3b8ec106fec0db3766b43a205
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-16 10:25:18 +01: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
Yuchen Deng
012ff2d22a Editor: Add feature for set/unset UTF-8 BOM
Change-Id: Iec7e36b1d7a526d7fa8a8096110b91f9c4cc44f9
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-15 11:11:03 +01:00
Thomas Hartmann
ceaa3e7461 Wizards: crash fix
In the case of cancel currentItem is null.

Change-Id: I337bcf9e1873e9f6525c898c7275ec594f9baeb6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-15 10:56:33 +01:00
Kai Koehne
a2d3d7f3bf Move EventFilteringMainWindow to utils
Also rename it to AppMainWindow. We add some more functionality to
it in following patches.

Change-Id: I752ccd07759eaaf6a2e96ec758e35b595bf788a2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-15 10:21:43 +01:00
Eike Ziller
2ba3f6c929 Merge remote-tracking branch 'origin/2.5' 2012-03-12 15:10:32 +01:00
Eike Ziller
9f1d495cd2 Different take on fixing uncategorized external tools.
Avoid relying on isNull vs isEmpty by explicitly passing a bool
found output parameter.

Task-number: QTCREATORBUG-6961
Task-number: QTCREATORBUG-6960
Task-number: QTCREATORBUG-7026
Change-Id: I1e215867fd91d2cf37ad420967b18e56cb644442
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-12 10:02:29 +01:00
Eike Ziller
658dc6f410 Revert "Fix adding external tools."
This patch breaks lots of other things,
it just gets insanely complicated for no gain whatsoever.
This reverts commit bdb5ecd1bc.

Change-Id: If38302c38ef42abd86e0b01021ded5162faf9e93
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-12 10:02:09 +01:00
Eike Ziller
87decf9f79 A bit beautification of "Save unchanged" dialog.
* focus set to the list instead of the button
* list shows file icons
* replace hack that tried to avoid resizing save button by real fix
* Mac: left-aligned "do not save" button
* Mac: alternating colors in list
* Mac: same sized "cancel" and "save" buttons

Task-number: QTCREATORBUG-1120
Change-Id: Ic6aca8fca105517c3aaddc451640def43e955b77
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
Reviewed-by: David Schulz <david.schulz@nokia.com>
2012-03-09 11:57:22 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
2012-03-08 07:48:55 +01:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01:00
Eike Ziller
09e0c4899b Merge remote-tracking branch 'origin/2.5' 2012-03-05 08:59:13 +01:00
Alessandro Portale
117e468410 Polished split and unsplit toolbar icons
Now, they are crisp and have a shadow.

Change-Id: I374bc731fc4b02d2df6cd09cf13c83eab44c2899
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
(cherry picked from commit 89bb6d5327)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-05 08:41:07 +01:00
Leena Miettinen
3fff0b2f98 UI text: use book style caps for options in pull-down lists
Change-Id: Id4ada4406d7ea73f9b2f99f2be5187c9ff9415b0
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-02 15:32:33 +01:00
Friedemann Kleint
4e83fb7953 Port Qt Creator to the new plugin system of Qt 5.
- Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN
  for Qt 4.
- Generate the Json files for Qt 5 from the pluginspec
  files by using a XSLT sheet.

Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-02 14:13:49 +01:00
Eike Ziller
5f86aba16c Merge remote-tracking branch 'origin/2.5' 2012-03-02 09:38:28 +01:00
Eike Ziller
bdb5ecd1bc Fix adding external tools.
Task-number: QTCREATORBUG-6961
Task-number: QTCREATORBUG-6960

Change-Id: Ied0b01f5a43bdc187625c0b7aa98845588322e5d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-01 18:22:18 +01:00
Alessandro Portale
89bb6d5327 Polished split and unsplit toolbar icons
Now, they are crisp and have a shadow.

Change-Id: I374bc731fc4b02d2df6cd09cf13c83eab44c2899
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-01 16:05:15 +01:00
Thomas Hartmann
824342773c Wizards: increase width of dialog
We do not want scrollbars.

Change-Id: I16454d6ce941d7a9d5e4aadfc92f006b0b0db792
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-23 13:27:22 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01:00
Eike Ziller
b1ff83013c More consistency for close & close split.
Change-Id: I3d0869d5fc2542ff59434e0d42dae0ce6c7a2391
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-02-20 15:36:10 +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
Eike Ziller
2547d9a7d9 Add ActionContainer::insertGroup
Change-Id: I1a7047e0ccc074bb38661ecd34e2c0e64469d843
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2012-02-17 12:28:08 +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
c760f6d424 Wizards: splitting QtQuickAppWizard
QtQuickAppWizard currently has a combobox representing the choice of
Qt Quick Components + the option to import .qml.

After this patch instead of deciding this inside the wizard the decicion
is made by choosing one of 4 instances of QtQuickAppWizard.

Change-Id: If2f295b1dfc760d195dee83c59794104935016ce
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-14 14:14:28 +01:00
Eike Ziller
f916d38dce Make IFile::isReadOnly consistent.
It is supposed to refer to the property of the file on disk (if there is
any).

Task-number: QTCREATORBUG-4998
Change-Id: Iaed62c17d124b364aecec4d1f910046bade42d40
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-14 12:58:11 +01:00
Thomas Hartmann
b7713ee22d documentation fix
the classes have been renamed/moved out of the namespace.

Change-Id: Ia4a121e61c687517c99de6d63874a918039f1106
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-13 13:30:38 +01:00
Thomas Hartmann
8585d4aa2e Wizards: fix dialog layout
Change-Id: Ib2012eecbffeb7eea123ed666efe2d79a79e05ce
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-13 12:47:05 +01:00
Eike Ziller
d3abbae211 New close split buttons.
This change moves the "close document" button back to the top-left and
instead changes the icon on the "close split" buttons.

Change-Id: I187c3f707f38ea8edef996cb5393654015d551ca
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-02-13 09:14:32 +01:00
Thomas Hartmann
3aa2b0876c Wizards: add option to show an image for description
IWizard::descriptionImage() can return the path to an image.
An empty string is interpreted as no image available.

Change-Id: Ia2012eecbfdeb9bec123ed666fff2d73d79e05ce
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-10 16:47:12 +01:00
Thomas Hartmann
08e4016886 Wizards: use display names for supported platforms
The display names might be different form the internal string id.

Change-Id: Ib2bf9d0ee2fbf87b2ba20a79e8b456830e7a940e
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-10 12:56:11 +01:00