Commit Graph

25792 Commits

Author SHA1 Message Date
Eike Ziller
368806683d Mac: Fix font rendering on HiDPI screens.
Render fonts in high dpi.

Task-number: QTCREATORBUG-7864
Change-Id: Ife6f281e537b9e300db1ceecc0b2703e78ace7e6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-09-13 09:21:39 +02:00
Eike Ziller
d7079ed870 Windows build fix.
Broke with d3c0557444
Remove the logic for setting jom as default or not, and just set it as
default, since the new AbstractMsvcToolChain::makeCommand uses nmake as
a fallback if jom is not found.

Task-number: QTCREATORBUG-7876
Change-Id: Ia96c2449863fbbd027fbaf003d75bb6155206289
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
2012-09-13 09:00:41 +02:00
Christian Stenger
77a6b71f72 Squish: Use global objects.map from inside QMLS
Change-Id: I5c37408bc3a0e232d7f2a70e01db510725f99df1
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-12 17:22:39 +02:00
Oswald Buddenhagen
f53ed6c4b3 don't pretend that break()/next()/return() are functions
it's a pretty braindead thing to implement control flow statements as
(built-in) functions.

as a "side effect", this fixes return() value handling for lists.

Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-12 17:05:20 +02:00
Oswald Buddenhagen
00c0d0d5e4 improve parse error recovery paths
to reduce collateral damage from parse errors.

Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-12 17:05:17 +02:00
Daniel Teske
d3c0557444 Make Toolchain::makeCommand return a full path to the make command
Requires passing in the environment to use. Also now the mingw toolchain
has a fall back to make.exe on windows. And the msvc toolchain falls
back to nmake even if the "use Jom" option is used.

Task-number: QTCREATORBUG-7831

Change-Id: I850a96da41a380eef8c6992e27a72fb63958c456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
2012-09-12 16:29:30 +02:00
Daniel Teske
f89352d7a8 Fix the class view
Task-number: QTCREATORBUG-7861

Change-Id: I0a5d2fb1ca3a8df8236b6b964ab612fb37383100
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-09-12 16:29:00 +02:00
Leena Miettinen
f044873fb1 Doc: changes in debugger management for kits
Change-Id: I3bfd3b0794281a4776437f9498bf4a7251f30c20
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-12 15:28:25 +02:00
Leandro Melo
8a917b3011 C++: Fix add definitions on empty files
Task-number: QTCREATORBUG-7838

Change-Id: I8e9d452cf4c8ab5dd9f2a7f39d3802baf84609e1
Reviewed-by: David Schulz <david.schulz@nokia.com>
2012-09-12 14:39:35 +02:00
Christian Stenger
7f98c517e1 Squish: Use global objects.map from inside HELP
Change-Id: I3df21777eb06e002de318c094741e3ff878a5f17
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-12 14:08:44 +02:00
hjk
5abe9e7242 texteditor: generally allow mark requests for all "plain" texts
Task-number: QTCREATORBUG-4546
Change-Id: I61ad34a063c720ae53e21e7b0239e8b8b91c0763
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-12 14:03:09 +02:00
Christian Stenger
7218a2b428 Squish: Fix for UI change
Change-Id: Ie3d0c8deae67020d7adcd2bd69807f190bc0be0a
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-12 12:56:47 +02:00
Christian Stenger
e98a947998 Squish: Use global objects.map from inside CSUP
Change-Id: I70b80f926d01f801f842cd45ca3710b9d16de273
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-12 12:45:15 +02:00
Daniel Teske
91a9a2414d OutputPane: Flash the output button instead of switching to edit mode
That is if the current mode has no OutputPanePlaceHolder, then we don't
switch modes, but flash the button. Also if the button is not visible,
we make it visible. The button doesn't autohide though.

Task-number: QTCREATORBUG-7272
Change-Id: I5ceacd2a17d1ece744f28952819c34bfcfdd5e7b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-12 12:06:53 +02:00
Orgad Shaneh
80502c610f ClearCase: Fix Check-In for external files
Change-Id: Ic1edf63e7fe1667e7e3b59a610ba77bfe6308a2c
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-12 10:33:06 +02:00
Robert Loehning
3a044b1ec8 Fixed capitalization on "Kits" Options page
Change-Id: Iedc27acff78db5eccfac902ccbffce7480766fb5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-12 08:13:45 +02:00
Leandro Melo
845886852b C++: Fix endless recursion in base template lookup
When the template and base template are actually the same.

Task-number: QTCREATORBUG-7830
Change-Id: Ibf8ab5f5ee8da544ec768a078bd272500d2dc604
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-09-11 18:35:16 +02:00
Daniel Teske
6253af47f6 Include unknown errors in badge number
Those were treated incoherent between different places.

Task-number: QTCREATORBUG-7792
Change-Id: I6dcd596ebb5e12dc952a93db8aab75930caadc6a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 17:30:40 +02:00
Daniel Teske
d4cbef628c Coding style fix
Change-Id: I45771b51c146057da37ecae617a8321dde7fc095
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 17:30:32 +02:00
Oswald Buddenhagen
6706df97ac use new qmake functions under qt5
waaaay faster than the hand-crafted ones

Change-Id: Ia4f60207b26a01752ca1eeddf1d8a76381cd1710
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-11 17:27:40 +02:00
Oswald Buddenhagen
d472a6638b use the right reference variable for source path
$$PWD is not really defined at this point. in qt4 it was the last value
assigned to it, while in qt5 it is just missing.

Change-Id: I4e70d234a7d5cee88e2d081b053e1ffa1070f788
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-11 17:27:11 +02:00
Orgad Shaneh
4ef2fbd4ce Profile -> Kit variable renaming
Change-Id: I6cc06684134030bd527d9dcce21ad17938a56927
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 17:08:52 +02:00
Leena Miettinen
5aef98bb66 Doc: changes in the Debugger field in the Kits tab
Update screenshot.

Change-Id: I980ad1396854ea4e59b26ccbc780de86469276fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-11 17:06:15 +02:00
Leandro Melo
cd6b440a18 C++: Fine tune behavior of "expand macros" flag
Even if "expand funcion-like macros" is unset we still
perform the expansion in the case it's already doing
so - when it originally started from an object-like macro.

Task-number: QTCREATORBUG-7712
Change-Id: Ie2a24de227f757d195146477d48246472082d28a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-11 17:05:10 +02:00
Daniel Teske
69697c5aff Fix searchInPath
Change-Id: I38f27a36891210d99f576fd7f57cd44854a14d8a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-11 16:39:25 +02:00
Friedemann Kleint
d339637701 Move debugger kit settings into a separate dialog.
Change the DebuggerKitConfigWidget to contain a display label
only. Add a Button with a menu for "Autodetect" and
"Edit...".

Change-Id: I8ec17966ef220c81fb8b145a61df4408d5950da9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 16:27:15 +02:00
Daniel Teske
d02d67d58c Fix searchInPath in various ways
Search in path order not in extension order. That is prefer exec.bat to
exec.exe if exec.bat is earlier in the path.

On Windows only append extensions if the executable has none. (That's
how the shell works.)

Change-Id: I4774f47e5d8e71efccbce49f3facc360eb2a193e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 16:02:24 +02:00
hjk
c68c96fd23 qtsupport: remove unsed class QtTypeKitMatcher
Change-Id: I33e771ec33ef0bdfe1d1ca0e91b2a4022bf0ade9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 15:41:53 +02:00
Daniel Teske
4668b7b1d3 Qt Quick Qt4Project: Fix updating of removed or moved qml files
Task-number: QTCREATORBUG-7842
Change-Id: Ie11df6b2681f35a44684757f7601b90c766a68c1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 15:20:57 +02:00
Orgad Shaneh
bb4bb75e78 ClearCase: Add commercial license information
Change-Id: I6e94ffe61451984ba06630e52db3c2901687b7c9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 15:15:50 +02:00
Christian Kandeler
f379d2a416 Debugger: Fix .pro file.
QMAKE_CHK_EXISTS_GLUE is not defined in Qt 4.

Change-Id: I27c14940d03a1ecaec69ab413552b6b2d3a6bc36
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 14:27:50 +02:00
Eike Ziller
fa094b2261 Version bump.
Change-Id: I9e4f32135a36ab15888e2461c3ec599ea11c6dfd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 13:54:40 +02:00
hjk
799cf1cee3 Changes: mention some debugger and fakevim related items
Change-Id: Ifcea35fc39c06c095ecc03d129246d6d6538dd30
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-09-11 12:56:58 +02:00
Christian Kandeler
e5222c5d4d Debugger: Make built-in tests work for shadow builds.
Copy testing resources to build directory.

Task-number: QTCREATORBUG-7834

Change-Id: I8397da049142817a16d433e8805144c4ae6bc305
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-11 12:16:01 +02:00
Friedemann Kleint
2fc6b24a8a CDB: Fix dumping of objectNames() in Qt 5.
Qt 5 has an additional extraData.

Change-Id: Ieac0a1855ed93b4ef2c0900e37097d89de440895
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-11 11:59:43 +02:00
Friedemann Kleint
0983e67fd1 Update German translation after Kit renaming for 2.6 Beta.
Change-Id: Ib6bd46e66eb0d44a9e710f884537d6b85b23f1b9
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-11 11:38:35 +02:00
Kai Koehne
d9f3a86461 QmlJSEditor: Use for .qmltypes
Make sure that the QML editor is used for .qmltypes files.

Change-Id: Ib9c8e497160ec9dc63eebd56485388c4b97635de
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 11:30:36 +02:00
Kai Koehne
6063113779 changes-2.6.0: Fix name
Change-Id: I031e9be42f111450b6a66509d158d0ef92f8d8f9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 10:51:31 +02:00
Friedemann Kleint
d21c7650d5 Populate Kit Chooser in Analyzer dialog.
Task-number: QTCREATORBUG-7857
Change-Id: I9ad560b1cf915e7167b413b697cbf7b89c1f8074
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-09-11 09:55:57 +02:00
Robert Loehning
e16eb7ea43 Removed unneeded and mistyped HTML
Change-Id: I49f50fc213b88af478c1411933630eb705898c23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-11 08:19:33 +02:00
hjk
d34f44f460 debugger: fix display of signed data in arrays
This was a regression introduced with the block dumping for arrays.

Change-Id: I9684fafeb27a9268a2558557f76d1092136975a4
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-11 00:33:46 +02:00
Kai Koehne
66a19cc457 Changes: Mention merging of QmlJSInspector into Debugger plugin
Change-Id: I5e04b0f24c56427e30e380e844729ca98111f1e2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
v2.6.0-beta
2012-09-10 16:29:16 +02:00
Robert Loehning
615f7900d3 Removed pointless numerus form
Change-Id: Ia40a01f985499389c04307336d6f480d3c1788a9
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-10 16:23:21 +02:00
Daniel Teske
99d2a158c1 QtVersion: Fix incorrect check for installation
Task-number: QTCREATORBUG-7847
Change-Id: I0af0c02b2ab04a82def5d0e9a1baee0d95919a16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Loïc Yhuel <loic.yhuel@softathome.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-10 15:08:01 +02:00
Christian Kamm
0df5933539 QmlJS indenter: Fix wrong indentation after list<> typed properties.
Task-number: QTCREATORBUG-7726
Change-Id: If709a9a71cfed69e2f14af92c114f79d11d03145
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-09-10 14:21:57 +02:00
Eike Ziller
b17e944d4b Fix freeze when clearing search results while doing a search in search
By fixing a deadlock in aggregate destructor.

Task-number: QTCREATORBUG-7757
Change-Id: I6dffb06a92fb57b23a38b26b1528aed9f9f9d5da
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-10 12:30:45 +02:00
Orgad Shaneh
beb6bf2972 SettingsAccessor: Read pro.shared file
Task-number: QTCREATORBUG-7850

Change-Id: I20776c9dc1003dd089e0d5d85b63372d8e68e900
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-10 10:54:27 +02:00
Eike Ziller
da70f19ba0 Version bump.
Change-Id: If3c1355c49d0447a012c034cc4ff05a80a604767
2012-09-10 08:58:34 +02:00
Orgad Shaneh
a131793f51 Search: Allow empty prefix for completer
Change-Id: Ia3a77c4512c03496cac492d401c2bff3eee7a980
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-10 08:31:55 +02:00
hjk
507334526e debugger: make 'Attach to Remote Server' port customizable again
This was a regression after the target changes.

Change-Id: I7dd382d741c64116afee418b12f8774dea4da70a
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-09 14:16:04 +02:00