Commit Graph

23693 Commits

Author SHA1 Message Date
Orgad Shaneh
f1c299a85e Qbs: Allow provider specification for plugins
Change-Id: I2016da500a9e81d8b2065c4c1c26a15d59c15abf
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-05 15:08:57 +02:00
Thomas Hartmann
781ff76d5a BaseValidatingLineEdit:: keeping the cursor pos
If the length of the sring gets altered we ensure that
cursPos < text.length().

Change-Id: I0040405e4d971ac253bcfa4d7158fdac673d2478
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-05 14:34:37 +02:00
Daniel Teske
20efc0a6f6 Fix reloading removing all BaseTextMarks
It was already broken in 2.4.

Task-number: QTCREATORBUG-7110

Change-Id: I24fae889c67ba5436548b7534d7257b6680a8c81
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-05 11:59:09 +02:00
Daniel Teske
71d5e838a4 Fix sorting of Add Buildconfiguration menu
Also make the code simpler.

Change-Id: I75ff5937d89760f83a23214806ee257e8a3bc7da
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-05 11:58:58 +02:00
Leandro Melo
eb74931dd7 Editor: Fix crash in generic highlighter
Add a method for basic structural checks of a definition.
Currently it simply tests for a initial context.

Task-number: QTCREATORBUG-7053
Change-Id: I56415034b50908d6da5f66ffab7def8fdd5fa1fb
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-05 08:06:30 +02:00
Orgad Shaneh
7c618087e2 GitIgnore: Added build and renamed gdbdebugger -> debugger
Change-Id: I5991a8066316f0596b65664bcd0a6302c634a472
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-05 07:33:40 +02:00
Daniel Teske
ae7f8e9260 Unbreak compilation after merge
Change-Id: I5ef36a1978926381c3e7ebb007196a33fcdba4ba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-04 20:34:28 +02:00
Thomas Hartmann
55dc42b380 Fixing regression in BaseValidatingLineEdit
Task-number: 7238
Task-number: 7239

Change-Id: Ia0c5d13be2bd2e0decf0644882b0eb80054609bf
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-04 17:54:41 +02:00
Fawzi Mohamed
25e08f5545 mdnssd: reset on too many consecutive errors
Keep track of select errors and if too many accumulate simulate
a sleep/wake cycle.

Change-Id: I9af869f77d922a174c08f6f4a54dde57f493f29c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-04 17:41:58 +02:00
Fawzi Mohamed
a9f830e347 mdnsd: kill older mdnsd processes
Change-Id: I36f38248fc5630b363800695bfc82f4ea8e597fe
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-04 17:39:12 +02:00
Eike Ziller
c814538d95 Merge remote-tracking branch 'origin/2.5' 2012-04-04 16:20:10 +02:00
Fawzi Mohamed
12624eb7f4 zeroconf: wait forever in read_all unless exiting, reset QuickCheck
* wait forever in read_all unless we are exiting
* guarantee that longer response time after the first time do not
  lead to thinking that the daemon did disconnect

Change-Id: I6888da92c584c2a679846f0ba9f7129e4115703d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-04 16:01:12 +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
Marco Bubke
4c6b794774 Add sysroot to the gcc tool chain system header detection
If no sysroot is applied the sysroot/usr/include path is not detected. Is
fixing a typo too.

Change-Id: I6a4e750b8b24b9f702ff4874810a91f020fca410
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-04 13:39:16 +02:00
Robert Loehning
791a196f1d Squish: Always using menu to close Creator
Change-Id: I9f8019a23ad96baa865c74721fb8712d612adb81
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-04-04 13:14:43 +02:00
Jan Kerekes
2ece74469c Added new test cases/suite for complex project compilation
initial commit

Change-Id: Iefa2e05b4dcd70d599bbf4c7de1ae230cd8f0450
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-04-04 10:28:23 +02:00
Andre Hartmann
998e4ae139 Fix C++ Macro Usages definition line in Search Results.
Add the complete line to the Search Results window,
including '#', "define", macro and macro value and
all possible white spaces between them.
Also covers the case of line continuation in macro
definitions from commit 3dec48557a.

Task-number: QTCREATORBUG-7217

Change-Id: I8b9d0c23d31ef76244833a9b9d67469c5c4a5635
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-04-04 09:12:59 +02:00
Yuchen Deng
4f0170e5c4 Doc: Build fix for Qt5 compilation
Change-Id: Id09f218492ce2b82e1c7ceae6e9324e52972aeb1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-04-04 08:15:32 +02:00
Christian Kandeler
c616d93800 Device Support: Clear auto-detection label when last device is removed.
Change-Id: I11c1ec1203519c965dd005c81a74442adc06d04c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-04 08:06:28 +02:00
Joerg Bornemann
9fb3afa58b qbs: plugin names changed according to plugin loader
Task-number: QTCREATORBUG-7231
Change-Id: Iab9d4b729494c69262986b5b8071af7a028b5a4e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-04-03 18:15:25 +02:00
Friedemann Kleint
b7856be521 Help: Decouple BookmarksWidget from OpenPageManager.
Connect via signal to make it possible to build the shared help
code as a static library.

Change-Id: If4e9c8ee43eb32e08167c7642f52214643de6d5c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-03 17:26:54 +02:00
Fawzi Mohamed
154364bab7 zeroconf: improve startup of mdnssd
give enough startup time, while still quickly bailing out when quitting

Change-Id: I628621099e9ead4defc4613615ccb5e8303ff2df
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-03 17:26:11 +02:00
Joerg Bornemann
fac8b11965 duplicate binding in qtcreator.qbs fixed
Change-Id: Ib2aaf4ab44d61a0ff8f91cb7a8ec0ac2baf0c2b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-03 17:21:45 +02:00
Friedemann Kleint
42625ec3d2 Compile autotools-plugin with QT_NO_CAST_FROM_ASCII.
Change-Id: If8928c5d2d878339aa3a7808655f8125e0a012cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-03 14:42:56 +02:00
hjk
6830905e96 debugger: don't queue -exec-interrupt
Change-Id: I65da52375872552064ffa4fa9db8292d27f64f67
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-03 14:16:56 +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
Christian Kandeler
1348e92971 RemoteLinux: Fix ports gatherer API.
The ports gatherer used to take an SshConnection for historical reasons
(connection sharing in the absence of a connection manager). This is no
longer required, since all the information needed for creating or
re-using a connection is available from the device.
In addition, the old code assumes the connection is already established,
which some newer callers did not adhere to, so this patch also fixes a
bug.

Change-Id: I3fd7fec7de9b64126358749f727a403bfa1e0a94
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-04-03 13:45:38 +02:00
Aurindam Jana
23a420eb3f BaseTreeView: Add to qbs file
Related to 66af0d9004b15d7c0389a3bd0a95ac1d23b1031c

Change-Id: I5d7c64c5c4110ccf22af5a4af992e18019009d6f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-03 10:23:07 +02:00
Friedemann Kleint
ce4b4df66b Suppress warnings about file watcher failing to watch config file.
Change-Id: I4a1215b594c8a08278779ad54db719d40db7bece
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-03 10:22:22 +02:00
Christian Kandeler
27730b8455 SSH: Fix connection check in SFTPFileSystemModel.
The current code is not technically buggy, but does unnecessary
things and therefore might confuse people looking at it.

Change-Id: Ia6fcca575a8cc9856e86c66f337e2bffd9bf4b3a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-03 10:09:49 +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
Eike Ziller
1ba94139b1 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2012-04-03 09:59:54 +02:00
Aurindam Jana
ecdecd4e97 DebuggerTreeView: Move base class to utils
Change-Id: I3313789be5f835d218cad5ed5f3143aee18e9f5f
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-03 09:28:57 +02:00
Orgad Shaneh
8d5d1f2f66 Dumper test: Add member to Derived
Change-Id: I324d31f9bfe98689136bb9e9ed40dfe46fa9ca81
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-03 09:25:14 +02:00
Christian Stenger
a96cbcf335 Squish: Small fixes for utils.py
* invokeMenuItem(): changed order and additional
  waitFor to be more error-proof on Mac
* logApplicationOutput(): added try/except block
  for cases where no former run/debug could be found

Change-Id: I0d434fbb964e3d85e5ccb2a4c336e14e956f44ce
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-02 18:10:46 +02:00
Francois Ferrand
68471c2100 Preprocessor: fix macro definition line.
The line corresponding to the macro definition is simply the token's
line. This caused errors in the macro definitions, since there were
multiple macros defined on the same line of the same file.

Task-number: QTCREATORBUG-7217
Change-Id: I56d17eeba677ac51f9eed283c0e964019bdfe4b7
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-04-02 17:01:52 +02:00
Takumi ASAKI
fcb825d4f6 Qml/C++: Add finding C++ qmlRegisterUncreatableType calls.
Change-Id: I4e1b87cc247a04236a9c9f157d04b1fc817530d0
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-02 16:19:08 +02:00
Christian Kandeler
79f238fb75 RemoteLinux: Allow deriving from LinuxDeviceConfiguration.
Change-Id: Ifd8405c079e047a40264c8310731cedbf7bd652f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-04-02 16:11:12 +02:00
Joerg Bornemann
9456948884 qbs files: missing dependency fixed
texteditor_dependencies.pri adapted.

Change-Id: Id8e2a12701deb6b2e3754dd67d583cfb58c21d95
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-02 16:02:52 +02:00
Jan Kerekes
5254e3e547 Added new test cases/suite for simple project compilation
initial commit

Change-Id: I06d211ba9878852839cd4774b930efd8cde244ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-02 15:38:21 +02:00
Christian Stenger
7e4e06796e Squish: Small fixes for runAndCloseApp()
Change-Id: I74136202c2d5e482a18a56ea2c0ba11d9d958574
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-02 15:30:03 +02:00
Francois Ferrand
1a10bcdaad Add test case to preprocessor.
- This enables some tests which had been unexpectedly disabled in
earlier test.
- Tests to show issue QTCREATORBUG-7225.
- Tests which validates somehow behavior of preprocessor for
QTCREATORBUG-7217: the test passes, so the problem is likely not in the
startExpandingMacro() notification.

Change-Id: Ib7c1433e4dcdd8c1d19fa117371f94c1645ec3fb
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-04-02 15:16:25 +02:00
Tobias Hunger
5c7bc3949c QtVersion: Get version string from qmake -query
We need to run qmake -query during initialization anyway, so it
makes no sense to use the faste qmake --version to get the
Qt version number.

Change-Id: If4f5efa074885a9be8938d54767008d8f1dc0d6b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-02 14:48:18 +02:00
Fawzi Mohamed
f19c170a1e zeroconf: increase wait for daemon to reduce the possibility of starting multiple daemons
Change-Id: I406e5e86f1d549471d7b0f178763a4dd283e369c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-02 14:38:12 +02:00
Fawzi Mohamed
4f239ff00d mdnsd: cope better with large changes in time
Large changes in time can happen due to sleep, or long uptime.
Maybe calling the sleep hooks should be considered for a future fix.

Change-Id: I746c2176a9b36cbafd5679ec1529ad59f8b691b5
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-04-02 14:03:35 +02:00
Orgad Shaneh
d6a2667dac Dumper: Fix dynamic type dumper for generic struct
Change-Id: Idb5ff44061afa8170afed3737f1be378165732f2
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-02 13:50:45 +02:00
Francois Ferrand
332072019a Preprocessor: Fix client notification.
- Notify end of macro if function expansion is skipped.
- Do not notify client of generated macros expansion.

Change-Id: Ic027fc13ee391425a5ebadc8e84b9305912dbcf0
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-04-02 13:49:00 +02:00
Joerg Bornemann
26d0311b70 qbs files: share.qbs updated
Now the Welcome screen is visible again.

Change-Id: I41aeae823c6f81dfec93111f9b4a957f812cb496
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-02 13:46:46 +02:00
Eike Ziller
2355c4f809 We should not touch QMAKE_MKSPECS qmake variable.
Change-Id: I954ad9a231207b175ac9116ca310290dfaa2980f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-02 13:04:42 +02:00
Eike Ziller
40f534e439 We should not touch QMAKE_MKSPECS qmake variable.
Change-Id: I954ad9a231207b175ac9116ca310290dfaa2980f
2012-04-02 13:02:06 +02:00