Commit Graph

25445 Commits

Author SHA1 Message Date
Marco Bubke
b19bebbfa5 QmlDesigner.Tests: Compiling again
Change-Id: I85a7fc5c37d9beea6e2433a9fd2a3ef779f0d63c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-03 18:02:15 +02:00
Oswald Buddenhagen
e3eea3a935 factor out evaluateConfigFeatures()
Change-Id: Ida8e871f8a1bcb9598dc83874ed2db17083a7fd5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:58:17 +02:00
Oswald Buddenhagen
79fcd3f448 evaluateFile() => evaluateFileChecked(), evaluateFileDirect() => evaluateFile()
this is a more natural naming scheme

Change-Id: I376b16d14924d6c816b4eeab5169f54890164388
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 17:58:06 +02:00
Oswald Buddenhagen
c4ec7942f0 add support for extra vars and extra configs
will be needed for qmake build passes

Change-Id: I6c887abd8e9e858954ce90c60ccdd1b70b6aeee3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:57:56 +02:00
Oswald Buddenhagen
5af04e6b29 generalize visitCmdLine() a bit
it's basically the most generic unchecked eval function possible.

Change-Id: I8f6ec5c0f35d132500b80912f8d7b221bc183c85
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:57:48 +02:00
Oswald Buddenhagen
00e9be4246 make messages from dynamic code tell a useful location
"(eval)" does not exactly help to find the error source.

Change-Id: Iecd03e6a4909ca6d7eab846844ca4415ebfa3429
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:56:24 +02:00
Oswald Buddenhagen
26e9f25a3e reject utf-8 boms
... like qmake does

Change-Id: I0724d1981278d0e7c4d7b4d4cfa435adaf3622ee
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:56:03 +02:00
Oswald Buddenhagen
b2017f427d add dynamic property mode for qmake
in qmake, the property map is not pre-initialized with the values from
QSettings, as dynamic properties are typically unused, and thus
initializing them would be a waste of time.
consequently, make propertyValue() just a delegate to a QMakeProperty.

Change-Id: I11af5124f810f798214c43704fe49ace03a8f5b8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 17:55:52 +02:00
Oswald Buddenhagen
2847db0ecb setup {,x}qmakespec from environment as fallback
... like qmake does

Change-Id: I4d0dedfea5efcd1b5df2c3043788edf4bbd5c5ad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:55:35 +02:00
Oswald Buddenhagen
d0bc069e07 remove unnecessary parameter from evaluateFileInto()
all callers use the same value, so just inline it in the function.

Change-Id: Icc3f1301ec332cb18f5011b8abfb20703e94a491
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:55:23 +02:00
Oswald Buddenhagen
0ad234b691 add tracing facilities to evaluator
as other output code which is enabled only in full qmake mode, this
prints directly to the console.

Change-Id: I6a1578818512fa3b0773faf276a1d56881eb06d7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 17:54:57 +02:00
Oswald Buddenhagen
f4f1f968c5 make command line parser grok more options
-spec/-platform, -xspec/-xplatform, -t/-template, -tp/-template_prefix,
-cache & -nocache.

Change-Id: I1a0aa6ce830bf4d4beed319ebe248b15b2dc72c0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:54:11 +02:00
Oswald Buddenhagen
07a7cad50b revamp command line argument parsing
the command line parser can be now integrated with a parser which
understands more options.

Change-Id: Ib9de352376b2f03dd466d577435f680702d1e2b9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:54:01 +02:00
Oswald Buddenhagen
6f254b37a6 remove source tracking from property fetches
the tracking is meant for literal values only.

Change-Id: I46b29f07010412bbdf2eddcec8ab28774abed4d9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 17:53:33 +02:00
Oswald Buddenhagen
422485c892 add a bunch of ProString::append() overloads
Change-Id: I9f1f62d8ba57a1bec2c55fe32709b2f6db0f7882
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:53:21 +02:00
Oswald Buddenhagen
9f8b9eaf16 add ProString::prepend()
Change-Id: I2dc905470c90eeba15f0f00412405a9a1a2ddcc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:53:15 +02:00
Marco Bubke
43ff20d728 QmlDesigner: Move modelnodecontextmenu to the navigator
The context node of the model node don't belongs to model because it has
dependencies.

Change-Id: Ia67a055a4beac33477485d05574134ffe4dc6ae1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-03 17:45:39 +02:00
hjk
aa118de9ec fakevim: make test compile
This is a workaround. The real problem is a source incompatibility
from Qt4 -> Qt5 (beta). QSKIP wants 2 arguments in the first, and
1 in the latter case.

Change-Id: I11e914f378baf492cce62333a8284ba2a11bf61d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-09-03 17:08:34 +02:00
Marco Bubke
21790a7e8b QmlDesigner: Remove WidgetPluginManagerPrivate
Change-Id: Ibe3352dff9d620656ca4279d67e1e622a3e4dd41
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-03 14:11:03 +02:00
Marco Bubke
eda83c9148 QmlDesigner: Remove DeclarativeWidgetViewPrivate
Change-Id: I96fab51078169aa4fdf405609ccfb4b1a3a1e937
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-03 14:10:56 +02:00
Lukas Holecek
eb8f1379dc fakevim: Improved undo/redo
Change-Id: I9326820cf0b8c551932ffae4cc4ae0af8415fd4e
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 11:03:53 +02:00
Hüseyin Kozan
a753126959 Close opened files by middle click.
Change-Id: I548c62d6a043677e3989ec9f9082f2dcd731fae1
Reviewed-by: Dmitry Savchenko <dmitry.a.sav@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-03 09:46:30 +02:00
Eike Ziller
a225e5b867 Merge remote-tracking branch 'origin/2.6' 2012-09-03 09:08:49 +02:00
Eike Ziller
67e9bdbd44 Fix Mac debugging helpers removing arguments from locals
Change-Id: Ifce34d5f51d863eca9e7497a8638703f32cecf44
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:04:51 +02:00
Friedemann Kleint
6886e485de Handle watching/tooltips of C++ editor tokens consistently.
For editor tooltips and the editor context menu
'Watch expression', always try to find a local variable first
and use its expression.

Change the tooltip manager/widgets not to rely on the debugger
model enum and obscure expression, filter by complete iname
instead. Remove obsolete enumeration.

Change gdb's handling of tooltips such that local variables
are displayed immediately without creating additional tooltip
items.

Change-Id: I9b55823428029ba50d84d3a8cab55eb58942e72b
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:02:56 +02:00
Christian Kandeler
b7a1e87cf4 Utils: Add user name accessor to the Environnment class.
Change-Id: Ic67381ab185525552eef948af602d00d3800b653
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-31 19:26:16 +02:00
Robert Loehning
a37eca63b6 Squish: Added Qt Simulator target
Change-Id: I367dc2fb71339a335700d7411465b16ec114a7eb
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-31 17:36:06 +02:00
Yuchen Deng
0cb8c46328 Fix cross compiling for CMake based project
On Linux/Unix, there does not exist "MinGW Makefiles" generator.
Using "Unix Makefiles" can simply fixed the issue on Linux.
And does not effect Windows builds.

Change-Id: Id69e1a24485fbab05866f52d823035abc1dca06b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-31 17:23:20 +02:00
Christian Kandeler
b18b458dea Fix qbs build.
Was broken by I2d5bf2324a81bedcbe6ea0bb8d8a0eead94e52e4.

Change-Id: I78e3ae21ed0c45bc68f0467d6605588493f7f6bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-31 16:03:43 +02:00
Christian Stenger
89cfba79b2 zeroconf: Compile fix for MinGW
Change-Id: I08120e945fea6455ea109926b9b0a95406d078da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-31 16:03:38 +02:00
Friedemann Kleint
7f44d7b2ae Small compile fix for Qt 5/gccc.
Change-Id: I3bc3608f437e377f60fbf28ded950e3118ce69c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-31 16:02:46 +02:00
Leena Miettinen
92113a8bb5 Doc: Tool Chain tab was renamed as Compiler tab
Fields were also renamed accordingly.

Change-Id: I2f2658cdca2293c10c73d967fe66d520cb6de4d0
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-31 13:42:43 +02:00
Daniel Teske
7dc7907cb8 Work around kde file dialog being broken
Task-number: QTCREATORBUG-7771
Change-Id: I11a41f624dbeddbbff75e2b3a827315d26995425
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2012-08-31 13:16:50 +02:00
hjk
27c8563c45 debugger: fix "accumulated" locals and expressions on Mac
Change-Id: I922764db127242f1e392a2cb3906c61ba83c9b64
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 11:48:15 +02:00
hjk
9df46317a4 qt4buildconfiguration: code cosmetics
Change-Id: I39e60655384798fe5dcfc9d2c7c01747650774bb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-31 10:25:19 +02:00
Eike Ziller
25dea9a393 Merge remote-tracking branch 'origin/2.6' 2012-08-31 09:28:19 +02:00
Oswald Buddenhagen
64677d2e87 move statements to the right project file
there is no apparent reason to deviate from the standard of this library.

Change-Id: Ifffd2e7ebd3efdf4639e6ba616aff31da6c29b97
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-31 09:26:28 +02:00
Friedemann Kleint
e67e58378d Debugger: Use gdb's tooltip expression fixup for CDB and editor.
Factor out to watchutils.

Change-Id: I8cf316be819d765dcea964ac6405bfa9b075de59
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 08:56:22 +02:00
Oswald Buddenhagen
91d81443ed make Utils::HostOsInfo have zero runtime cost
Change-Id: I2d5bf2324a81bedcbe6ea0bb8d8a0eead94e52e4
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 08:43:28 +02:00
Lukas Holecek
a897a3b00a fakevim: Added tests
Change-Id: I6b6e54817bf41402f5575142b1adb9362c717439
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 08:41:39 +02:00
Oswald Buddenhagen
a32e243e61 Merge branch '2.6'
Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
2012-08-30 20:43:02 +02:00
Alessandro Portale
e6270852a3 Qt Quick App Wizards: Remove dead code
Initially, the wizard was able to make complex QML apps
with custom QML plugins deployable. That was then removed
from the UI. Let's now also remove the remainders.

Change-Id: If470d553c79d0e47bc8e4f0e814a0da2ef31bab6
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 18:05:43 +02:00
Marco Bubke
93e329e1eb QmlDesigner.NodeInstances: Use SharedMemory for image transfer if available
Sending images over the local socket is slow, but the Mac has a 4MB limit
shared memory. So we now use what we get and than fallback to the local
socket.

Change-Id: Idf40ee1603572c9e45bb1ed3e1abc7caf19e6fca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 17:24:47 +02:00
Marco Bubke
463eca4053 QmlDesigner.Integration: Remove integration core
This class had only one function and was rather useless.

Change-Id: I99fa64881cdf29cf074e6d4173eec6ea85cc2a2a
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 16:47:33 +02:00
Friedemann Kleint
5fdb9f0df9 Debugger: Add more C++ keywords.
Change-Id: I127a33939bd46945d2cfd47f70ee72cb50a986c7
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 16:45:32 +02:00
Oswald Buddenhagen
1ed3538b21 don't use HostOsInfo class in shared/proparser
this class cannot be used in code which is shared outside creator.

Change-Id: I0f4a6c1599bdf21fab532c974acf8ccd82ad318e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-30 15:59:28 +02:00
Orgad Shaneh
fb6b15f957 Remove stale shared/json directory
Symbian leftovers

Change-Id: I4479113b6f80eb4a667054d72da1b185c315f61d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 15:53:43 +02:00
Friedemann Kleint
5c4fddc6a5 Detect Linux terminal by checking a number of known terminals.
Change the behaviour of defaultTerminalEmulator() to already
return the run option in line with terminalEmulator().

Change the QLineEdit in settings to an editable
combo offering the available terminals.

Change-Id: I333ef08ad06934bcd9fcafb50ff1eced1af6293a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-08-30 15:49:40 +02:00
Leandro Melo
813539a70a C++: Fix lexer for token Q_SLOT
When adding Q_EMIT a while ago the the if chain got messed up
and Q_SLOT was being skipped.

Change-Id: Ib1f49c00290a09286506de9510d0067eaf5e3b96
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 15:34:04 +02:00
Tobias Nätterlund
e160d286f8 QNX: Fixed updating package path if deploy configuration changes
The path to the BAR package in the run configuration did not react to changes in the deploy configuration.

Change-Id: I5eabbf600a3c0704ff4049edeceee67644c615df
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-30 15:33:58 +02:00