Commit Graph

32683 Commits

Author SHA1 Message Date
Orgad Shaneh
a99c45d437 Rename Qt4 => Qmake in translations
Change-Id: I2794fed3f59669d8fa8bfa197208472447be19d5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-30 14:07:38 +01:00
Daniel Teske
cea16f4496 Android: Make warnings in application output red too
This does include qWarning() and qDebug() output

Task-number: QTCREATORBUG-10559
Change-Id: I12e98cc25574003d1d26cda84dff5db0c323959d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-30 13:47:54 +01:00
Eike Ziller
0ddb6cac29 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
2013-10-30 13:34:46 +01:00
David Schulz
8f47840bca Debugger: Fixing string concatenation in cdbengine.
Change-Id: Ibdc499d74a53ddd32040f9354c14bd748662ada2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-30 12:25:16 +01:00
Lincoln Ramsay
7aeae3ebdf Don't make the output pane get taller when switching tabs.
A code review change broke the logic. Revise to avoid this bug.
Load the saved height once at startup and save it at app close.
Track changes to the height as they happen.
This ensures the output pane does not get taller if you shrink
it and then switch tabs.

Task-number: QTCREATORBUG-8877
Change-Id: If0d0d0d45f2944477003eb407e64567441bad414
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-30 12:18:32 +01:00
Tobias Hunger
ece186d7bc SDKtool: Small cleanup
Change-Id: Ic8b88707d6cab9e4bd30db02595017fc6e5b84de
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-30 12:06:51 +01:00
Tobias Hunger
27143283bf SDKtool: Do not require --debugger "" when using --debuggerid
Change-Id: I9d1c7e5c16d492163d1f6459903096f3b9fb0758
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-30 12:06:37 +01:00
Tobias Hunger
3c9a23fd92 SDKtool: Fix explanation of options in help text.
Change-Id: If5b59896b36e2957c8c634184d75f859b6d1f91a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-30 12:06:25 +01:00
Christian Kandeler
afb7047bf7 QbsProjectManager: Fix display of command line in step widgets.
The command line equivalent of the respective options often gets too
long for the summary, which means that the end of the string is cut off.
Not only does that look ugly, it also hides information that is not
trivially available otherwise, such as the full path to the install root.
This patch therefore adds a text edit field that is guaranteed to be
able to display the complete command line. This is also consistent
with what the qmake step does.

Change-Id: Ic8d20e484e9cfe4980ea9eff05843fef1012f067
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-30 11:57:58 +01:00
Tobias Hunger
4d9ca94cab Update documentation
There is no Qt4VersionManager...

Change-Id: Id2573aa99730b1a48551a4670ef05a6e036c672c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-30 11:23:36 +01:00
Eike Ziller
c7e877f10b Help: avoid opening external browser for 'no documentation available'
Task-number: QTCREATORBUG-10513

Change-Id: I07af69fb5223faf5e030f30280ae3125731b79bc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-10-30 11:22:38 +01:00
Christian Kandeler
bcd704d7bf Introduce command-line tool for parsing build output.
It makes the functionality of Qt Creator's build-related
output parsers available on the command-line.
Concrete use case: Run this on the build machines and put
the output in the emails sent to potential build breakers.

Change-Id: Iea6870ed976790854aecfe3cdc0d5b2296b6bced
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-30 10:34:37 +01:00
David Schulz
88c647ce68 TextEditor: Update actions after toggling read only mode.
Task-number: QTCREATORBUG-9188

Change-Id: I3448645397e7a39487f2e961728ebef924eec7f6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-30 09:51:07 +01:00
Orgad Shaneh
0dbaac7bcf TextEditor: Normalize path on Windows
Searching with wrong case causes the code-model to have duplicate files
when opening a file from the results

Change-Id: Id3e4d875230e14c2ab23345a7440372f71f76e8b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-30 08:18:40 +01:00
Tobias Hunger
491ba6faab Qt4ProjectManager -> QmakeProjectManager renaming in a comment
Change-Id: I311768d2593ebeacdf69b8b2f26753addbf87b37
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 18:43:45 +01:00
Tobias Hunger
cc7511cb9b Rename the QmakeRunConfiguration to DesktopQmakeRunConfiguration
Also rename the related factory and config widget.

This was necessary since QmakeRunConfigurationFactory was already
taken by the base class.

Change-Id: I37875935101b7560ad64c8a8c27d821c9810b387
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 18:42:49 +01:00
Tobias Hunger
52a561c915 Qmake: Misc qt4 to qmake renamings
Change-Id: I47875935101b7560ad64c8a8c27d821c9810b388
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 18:37:29 +01:00
hjk
53e5636461 Debugger: Remove dead code from GdbEngine
Change-Id: Ibd5a5e5a80bb31b798b26b340fae460fdded7892
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:12:38 +01:00
hjk
37ad8f974c QmakeProjectManager: De-noise qmakerunconfiguration.cpp
Change-Id: I14971be5c00da949ff46729236c535d1ac29f9bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:12:22 +01:00
hjk
7ce22266de QmakeProjectManager: various renaming cleanup
Change-Id: I0433317d03aefb8e175f2208ca7ae29fa3e9fa49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:12:12 +01:00
hjk
8664de853a QMakeProjectManager: Rename *Qt4* wizards
Change-Id: I6e1bf4e603338e53f9264b0a2ee2a90ef345bbfe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:11:34 +01:00
Tobias Hunger
85997b0bc1 SDKtool: Consistently use const char X[] for constants in .cpp files
Change-Id: Iee70ddb526a1751120be40bfd8d2ae01b27b80b8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 18:11:13 +01:00
Tobias Hunger
63f7e76f6d SDKtool: Add support for debugger.xml
Add support to add/remove debugger entries to debuggers.xml

This is in addition to the existing mode of writing the debugger
path/debugger engine into the kit. This works reasonably well, but
the new mode offers better control as how the debugger is called, etc.

addKit also got a --debuggerid switch to set the debugger id instead
of using the old configuration format.

Change-Id: Id4be0366d2c126252419cf1ba87cd0e117204e54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:11:01 +01:00
David Kaspar
b5a39051c4 Qnx: BlackBerryConfiguration creates single toolchain and debugger
BlackBerryConfiguration creates single toolchain and debugger for Simulator
and Device.

The names of the created qtVersion, toolChain, debugger, kit in
BlackBerryConfiguration are simplified/unified.

Task-number: QTCREATORBUG-10461
Change-Id: I61bfef30a882b562ab03bd71aa4c3667a63343b8
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 17:59:55 +01:00
hjk
d7d27fccbc Rename plugins/qt4projectmanager to qmakeprojectmanager
This finally renames the plugin itself.

Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 17:57:06 +01:00
Leena Miettinen
733057e3a0 Doc: update illustrations on front page
And on other pages. Use a two-column layout on the
Getting Started page to make it more readable in small
browser windows (in Qt Creator, for example).

Change-Id: I362b260305f8f66ae1796911e372858eeb5cc26f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-29 17:48:01 +01:00
Christian Kandeler
0e149ae954 Update qbs submodule.
Change-Id: Ie0d54a26db031bc8732e8c83156a1102c5852706
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-29 17:10:25 +01:00
Tobias Hunger
69efa6e0ec SDKtool: Make the addtoolchain operation a bit less verbose
Change-Id: Ie60f20964da4636afa53eaa5bb8adf4cad63f98c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 16:45:22 +01:00
Tobias Hunger
979d6958b6 Remove bogus forward declaration
Change-Id: Ia3adfcbcc61ed955cc7cea5af7cae90d20f249c1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 16:35:31 +01:00
hjk
d24e1601d7 Qt4ProjectManager: Rename QT4PROJECTMANAGER_{LIBRARY,EXPORT}
Change-Id: I6be91281667f7f26740e7b62b08ce9d646bbc85e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-29 16:34:47 +01:00
Tobias Hunger
22da799cf1 Debugger: Read legacy settings from both SDK and user locations
This fixes Boot2Qt setting the debugger for its kits.

Change-Id: I3ac3ad70b29b6c852e5e50d3e64258e487455b43
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 16:27:38 +01:00
hjk
b55f60b110 Qt4ProjectManager: More Qt4->Qmake renamings
Change-Id: Iea96398de12845f992d647bbeca3bebf68bdd8ac
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-29 16:16:22 +01:00
Thomas Hartmann
dc434e8e28 QmlDesigner.PropertyEditor: fixing templates
Change-Id: I37f9691a320cdf4c63f7de72b2384624b5f67132
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-29 16:07:14 +01:00
Friedemann Kleint
b569de462f Fix compilation with Qt 4.
Change-Id: Id5043a1f208554b8e73a50ebacdb655af53dc8b5
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 16:06:53 +01:00
hjk
127106ee7b Qt4ProjectManager: Rename Qt4Manager, QmakeProjectManagerPlugin, ...
Change-Id: I22dd15b10a6b06b380f19eda31925951f4566ecf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-29 15:53:56 +01:00
Tobias Hunger
54d9f41c06 GccToolChain: Make macro retrieval more explicit
Make the retrieval of information on pre-defined macros more explicit
and use the information to populate the tool chain with after it is
constructed.

This avoids doing one run of the compiler per auto-detected debugger during
the start-up of Qt Creator.

Change-Id: Ie741dccede91079b4126056676c31975f340dbae
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-29 15:42:01 +01:00
Tobias Hunger
b17bb91355 GccToolchain: Move reinterpretOptions into the header
Considering that this is a Noop by default we want that inlined.

Change-Id: Iefd822ad9e5fc576fb538d9b891f6e3ed3b914aa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-29 15:41:54 +01:00
Tobias Hunger
ccce39e09c GccToolChain: Make macroCache handling accessible
Make the macro Cache accessible to derived classes. This is done
so that we can populate that cache with the data the factory/config widget
already has and thus reducing the number of times we need to run the
compiler.

Change-Id: I5ea72a0688c765ae995db66dde3ed6f6672198b6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-29 15:41:46 +01:00
Leena Miettinen
48fb32e0fe Doc: update the Android tutorial
Use the Qt Quick Controls application wizard to
streamline the process.
Remove snippet files and store compilable example code
in doc/examples. Do not store generated files.

Change-Id: I920484e84b2ef23bce9e77a7b0eddf963fe94552
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-29 15:22:17 +01:00
Daniel Teske
bad74c6b55 Qml Console view: Fix scrolling
Broken by qtbase commit 934f06220391eb0e0ebf66a2eb037f48adb4c43c

Change-Id: I55b1ae8636a1c1cf1ed75f4d03b58ebf5bba511a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-10-29 15:11:50 +01:00
Fawzi Mohamed
dc77196a3a Revert "utils/function: expose also ref and cref"
Visual studio 9.0 (2008) and 2012 work, but 2010 breaks :(

This reverts commit 0b90d7930804beb2f0a16e97b75a6e8fd9a2b835

Change-Id: I3c9bea05ac07ca8cdeb5be5fb89234675dd72061
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-29 15:08:46 +01:00
David Schulz
c8aeb78955 Fix compilation of IOS Simulator debugging on windows.
Change-Id: I57dc9297c89b193dbcb7dd9c96ff6d6118ce2191
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-29 15:08:31 +01:00
hjk
ce9c2efd1f Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode}
Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-29 14:54:53 +01:00
Thomas Hartmann
262a1e262d QmlDesigner.Qml2Puppet: fixes for composite types
Composites types need their own code path.

Change-Id: Ia1b14bf4f8519f786c08b94f168ec369d79defc0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-29 14:30:05 +01:00
hjk
b42a1b5918 Debugger: Enable exception hiding with LLDB
Closer to "production behaviour"

Change-Id: Id72a667cdc44c5102b574db30b6e806ab1deba83
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 14:25:11 +01:00
Fawzi Mohamed
c162ba1391 ios simulator debugging
Change-Id: Ieee4a509b46da937c3bce21f72c77685946db4dd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 14:03:58 +01:00
Orgad Shaneh
dc5ba1127d Enable Build File for files included by pri
Task-number: QTCREATORBUG-10546

Change-Id: I7b87d4907164840d2c40b70cf919eb31aefebff8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-29 14:02:15 +01:00
Frantisek Vacek
ac71bee072 Qnx: Cascades project template is obsolete
Qt Creator QTCREATORBUG-10375

The old Cascades template application was more sample than template
and it was simplified.

The application UI object name doesn't follow the project name anymore.
This change was introduced because C++ class name rules are more
restrictive than the project ones. More than that, it is harder
to start with some test project and then refractor it to some real one.
There is no gain to have UI object class name same as the enclosing
project one.

The application icon added to the bar-descriptor.xml

Change-Id: I198f61a631fa2c758f3e8ac377c06ce7560cc911
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-29 13:45:45 +01:00
hjk
1d9d3885b4 Qt4ProjectManager: Rename {Qt4,Qmake}BuildConfiguration{Factory,}
Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-29 13:39:48 +01:00
Tobias Hunger
31d67d0600 GccToolChain: Shorten and move gccPredefinedMacroOptions
Code cosmetics: Shorten gccPredefinedMacroOptions and move it to
the method that is actually related to that functionality.

Change-Id: I8aae1fd89f58d798f5bec95f16c7b92c44546e4d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-29 13:37:15 +01:00