Tobias Hunger
b669ba9dce
Subversion: Fix argument order when using --username and --password
...
These need to go after the subcommand, not after the "svn"
Task-number: QTCREATORBUG-13066
Change-Id: Id3de0af8b7b2f07159d5ddb1af2e5fa00dd0dbb3
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-06 17:08:24 +01:00
Tobias Hunger
1ef3d9dff3
Subversion: Bump minimum subversion version to 1.7.0 or later
...
Change-Id: Iaca84fb6b5c218f37ce415e72d409893c2306254
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-05 18:10:18 +01:00
Tobias Hunger
403f55a517
Subversion: Remove some dead code
...
Change-Id: I6f94ecdfb003eac9cc1eaf4460bb4d4a07e883f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-05 13:18:19 +01:00
Tobias Hunger
16844e1fbc
Subversion: Add vcsTopic
...
This partially addresses QTCREATORBUG-12929 which is about svn commit no
longer showing output which does include the revision number
Change-Id: I149f1fea05a63cc80625ba5e02c10edbce471e1a
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-05 09:32:57 +01:00
Tobias Hunger
0ee23c2313
Subversion: Allow describing the initial commit
...
Change-Id: If99b9d2bdd2f21d605beb39e65a4188f1b45ffc5
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-05 09:27:22 +01:00
Christian Stenger
37fe58d9b5
Fix endless loop while executing Core plugin unit test
...
Change-Id: I6e35bbb7e48594e75e2fa8eadd11ae4b8490f34e
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-05 08:10:37 +01:00
Tobias Hunger
74ce5fff52
Subversion: Improve detection of svn directories
...
* Subversion was not found when calling the managesDirectory method
in subversion's top level directory
* Subversion was not found for non-existing directories. This broke
the wizard's version control support.
Task-number: QTCREATORBUG-7763
Change-Id: Iefbd8e179c48b188e4f079fce8f72ae8b3ec0236
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-04 11:55:47 +01:00
Tobias Hunger
2c91b3b744
Subversion: Clean up commit message file after failed commit attempts
...
This prevents creator from claiming there is a ongoing commit when
trying to commit the next time.
Task-number: QTCREATORBUG-13236
Change-Id: Iaeb27db2cbebdeaf97cd410c05cf88c5d437046b
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-03 15:40:45 +01:00
Tobias Hunger
aca3892b85
Subversion: Force deletion of files
...
vcsDelete(...) is used after a file is already deleted from the
filesystem (and after asking the user), so it is safe to --force
the removal in svn.
Task-number: QTCREATORBUG-13271
Change-Id: Id3c076987f6518efb186a04d31855b189cfd52ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-11-03 15:39:54 +01:00
Eike Ziller
ea27143239
Merge remote-tracking branch 'origin/3.2'
...
Conflicts:
src/libs/utils/ipaddresslineedit.cpp
src/libs/utils/logging.h
src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
src/plugins/android/Android.pluginspec.in
src/plugins/android/androiddeploystep.cpp
src/plugins/android/androiddeploystep.h
src/plugins/android/androiddeploystepfactory.cpp
src/plugins/android/androiddeploystepwidget.cpp
src/plugins/android/androidpackagecreationfactory.cpp
src/plugins/android/androidpackagecreationstep.cpp
src/plugins/android/androidpackagecreationstep.h
src/plugins/android/androidpackagecreationwidget.cpp
src/plugins/android/androidpackagecreationwidget.h
src/plugins/android/javafilewizard.cpp
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/baremetal/BareMetal.pluginspec.in
src/plugins/bazaar/Bazaar.pluginspec.in
src/plugins/beautifier/Beautifier.pluginspec.in
src/plugins/bineditor/BinEditor.pluginspec.in
src/plugins/bookmarks/Bookmarks.pluginspec.in
src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
src/plugins/clangcodemodel/clanghighlightingsupport.cpp
src/plugins/clangcodemodel/clangsymbolsearcher.cpp
src/plugins/classview/ClassView.pluginspec.in
src/plugins/clearcase/ClearCase.pluginspec.in
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
src/plugins/coreplugin/Core.pluginspec.in
src/plugins/cpaster/CodePaster.pluginspec.in
src/plugins/cppeditor/CppEditor.pluginspec.in
src/plugins/cppeditor/cppfilewizard.cpp
src/plugins/cpptools/CppTools.pluginspec.in
src/plugins/cpptools/cpphighlightingsupportinternal.cpp
src/plugins/cpptools/cppmodelmanagerinterface.cpp
src/plugins/cpptools/cppmodelmanagerinterface.h
src/plugins/cvs/CVS.pluginspec.in
src/plugins/debugger/Debugger.pluginspec.in
src/plugins/designer/Designer.pluginspec.in
src/plugins/diffeditor/DiffEditor.pluginspec.in
src/plugins/emacskeys/EmacsKeys.pluginspec.in
src/plugins/fakevim/FakeVim.pluginspec.in
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
src/plugins/git/Git.pluginspec.in
src/plugins/git/gitorious/gitorious.cpp
src/plugins/git/gitorious/gitorious.h
src/plugins/git/gitorious/gitoriousclonewizard.cpp
src/plugins/git/gitorious/gitorioushostwidget.cpp
src/plugins/git/gitorious/gitorioushostwidget.h
src/plugins/git/gitorious/gitorioushostwizardpage.cpp
src/plugins/git/gitorious/gitoriousprojectwidget.cpp
src/plugins/git/gitorious/gitoriousprojectwidget.h
src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
src/plugins/git/gitorious/gitoriousprojectwizardpage.h
src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
src/plugins/glsleditor/GLSLEditor.pluginspec.in
src/plugins/glsleditor/glsleditorfactory.cpp
src/plugins/glsleditor/glslfilewizard.cpp
src/plugins/helloworld/HelloWorld.pluginspec.in
src/plugins/help/Help.pluginspec.in
src/plugins/imageviewer/ImageViewer.pluginspec.in
src/plugins/ios/Ios.pluginspec.in
src/plugins/macros/Macros.pluginspec.in
src/plugins/mercurial/Mercurial.pluginspec.in
src/plugins/perforce/Perforce.pluginspec.in
src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
src/plugins/pythoneditor/PythonEditor.pluginspec.in
src/plugins/pythoneditor/pythoneditorwidget.cpp
src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
src/plugins/qmldesigner/QmlDesigner.pluginspec.in
src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
src/plugins/qmljseditor/qmljseditorfactory.cpp
src/plugins/qmljstools/QmlJSTools.pluginspec.in
src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
src/plugins/qnx/Qnx.pluginspec.in
src/plugins/qtsupport/QtSupport.pluginspec.in
src/plugins/remotelinux/RemoteLinux.pluginspec.in
src/plugins/resourceeditor/ResourceEditor.pluginspec.in
src/plugins/resourceeditor/resourcewizard.h
src/plugins/subversion/Subversion.pluginspec.in
src/plugins/tasklist/TaskList.pluginspec.in
src/plugins/texteditor/TextEditor.pluginspec.in
src/plugins/texteditor/basetexteditor_p.h
src/plugins/texteditor/basetextmark.cpp
src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
src/plugins/texteditor/codeassist/defaultassistinterface.h
src/plugins/texteditor/codeassist/iassistproposalitem.cpp
src/plugins/texteditor/itexteditor.cpp
src/plugins/texteditor/itexteditor.h
src/plugins/texteditor/itextmark.cpp
src/plugins/texteditor/plaintexteditor.cpp
src/plugins/texteditor/plaintexteditor.h
src/plugins/texteditor/texteditoractionhandler.cpp
src/plugins/todo/Todo.pluginspec.in
src/plugins/updateinfo/UpdateInfo.pluginspec.in
src/plugins/valgrind/Valgrind.pluginspec.in
src/plugins/vcsbase/VcsBase.pluginspec.in
src/plugins/welcome/Welcome.pluginspec.in
src/plugins/winrt/WinRt.pluginspec.in
tests/auto/debugger/temporarydir.h
Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be
License update
...
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2014-10-09 11:41:44 +02:00
Eike Ziller
7224ccb2e7
Editors: Automatically add editor/document id to context and use that
...
instead of manually adding a context everywhere.
Change-Id: I4336015a6d19349171a255e949da89b0013d6700
Reviewed-by: hjk <hjk121@nokiamail.com >
2014-09-02 16:48:13 +02:00
hjk
9c152fce7e
Vcs: Collapse VcsSubmitEditorFactory hierarchy
...
Same pattern as for VcsSubmitFactory.
Change-Id: I7adb8868a83842c1b6c642db372a3624dd2e879e
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-09-01 10:41:21 +02:00
hjk
59259df569
Vcs: Convert to new editor construction scheme
...
Change-Id: I4b4516c8cdf1a934a7865ac6dce904a244995b5b
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-08-28 17:02:38 +02:00
hjk
5f7e89d914
Vcs: Some naming re-organization
...
Rename VcsCommand to VcsCommandTag, Command into VcsCommand
(Too generic to not mistake for Core::Command IMNSHO),
remove the now unneeded namespace qualification when not needed,
adjust surrounding code.
Change-Id: Iceb18a21e5e6dffa1a622241286f766985bb8d22
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-08-28 16:37:00 +02:00
hjk
f08ff20e94
Vcs: Move some static functions from *EditorWidget to *Editor
...
Change-Id: Ic7c0a3bca982f5728e28ff9f3e1e054b5a902ea9
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-08-28 15:09:28 +02:00
hjk
4d082cee74
VcsBase: Use static pattern for VcsBaseOutputWindow
...
Also rename to VcsOutputWindow.
Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2014-08-27 12:12:15 +02:00
Eike Ziller
aa6495a261
ExtensionSystem: Remove Qt4 support
...
Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.
Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com >
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-08-27 08:44:34 +02:00
Robert Loehning
bb8d0d2181
Do not shout at users
...
Change-Id: I744a3d45b67a4596ac8cc5371d9e3cb303946ae1
Reviewed-by: hjk <hjk121@nokiamail.com >
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
2014-08-22 13:51:09 +02:00
hjk
b5a1599776
Vcs*: Rename several *Editors to *EditorWidgets
...
Follow suit.
Change-Id: If22452a5e46d62d419ba273981b1f247f5095b53
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-08-22 11:24:01 +02:00
Eike Ziller
6772ba622a
Fix closing editor with ctrl+w or "x" or File > Close
...
If there are other editors on the document visible in some split, it
should not close the document, but only the editor.
Task-number: QTCREATORBUG-9346
Change-Id: Idce1ae2f518d4c6e875d86f9831d41c46c06361c
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-08-22 08:54:34 +02:00
hjk
2481e71d18
Vcs: Move editor construction over to new scheme
...
Change-Id: I491b9f37bfe15ebc800fedd5c683bfaf24e63889
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-08-21 11:50:27 +02:00
hjk
351abd035b
Vcs: Flatten the VcsBase::BaseCheckoutWizard hierarchy
...
Following the new simple-factory pattern
Change-Id: Idceb7a339169af37a040f9da7d36d3fe22dfb347
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2014-08-18 17:06:59 +02:00
Eike Ziller
264df002e6
VCS: Make submit editor closing independent from current editor
...
The VCS plugins keep a reference to the submit editor, so it can
explicitly be closed, instead of relying on the correct currentEditor in
the editor manager.
Change-Id: I14aab63447f790f2065a8d8dc6b50aeacbd1e941
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-08-15 15:33:14 +02:00
hjk
d7c2b0b681
TextEditor: Consolidate document access functions.
...
There was document(), textDocument() and baseTextDocument().
Two should be enough...
Change-Id: Id9e41c8d857c5cb3269a9fce5ab594d34448c982
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-08-04 10:43:56 +02:00
hjk
d1a8347e65
Vcs: Denoise *plugin.cpp and reduces scope of constants
...
Change-Id: If2eb34e8975cca46a52c61d902b89a5f99c757a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-07-28 18:33:15 +02:00
Orgad Shaneh
71b56d2b9c
Some QString -> FileName transformation
...
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-07-16 12:44:01 +02:00
Tobias Hunger
836e17a57c
Revert "VCS: Open diff/blame editors in other split"
...
This change has lead to complaints about diff views opening
in apparently random places for users with several splits.
This reverts commit 02b3a79c5f
.
Conflicts:
src/plugins/diffeditor/diffeditorplugin.cpp
src/plugins/subversion/subversionplugin.cpp
Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-06-17 15:40:40 +02:00
Hugues Delorme
0d0d79ce08
Svn: Asynchronous exec of commit operations
...
Use VcsBase::Command to implement the SVN commit operation, allowing
asynchronous execution (so the user can do something else while
committing)
Change-Id: Ic5513676d4dfea1920bb6610efa33788878a2a83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-05-26 16:48:39 +02:00
Tobias Hunger
67c2c77a99
Vcs: Append "Factory" to the variaus checkout wizards
...
Change-Id: I571717a389c63f4f0371570e22d3f2a834e8b900
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-05-26 11:43:48 +02:00
hjk
cc39cc4e48
Subversion: Denoise
...
Change-Id: Ieab1025f45f8edad1465b763d9d22df1b52d29ea
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-05-18 21:07:24 +02:00
hjk
814cd33032
Subversion: Use QTC_ASSERT when appropriate
...
Change-Id: I07520305e770b02a86828058162fd95b7df44fb6
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-05-18 21:05:51 +02:00
Orgad Shaneh
b3ff928b0a
VCS: Remove unused local variables
...
Change-Id: I72076d632ffd0b49e9e54dab27368a43787a36a3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-05-06 15:32:29 +02:00
hjk
3b84a6dc88
Use ICore::dialogParent for message boxes without parent so far
...
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2014-03-12 12:06:10 +01:00
Tobias Hunger
02b3a79c5f
VCS: Open diff/blame editors in other split
...
... if there are other splits that is.
Task-number: QTCREATORBUG-11623
Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-03-07 16:02:14 +01:00
Tobias Hunger
c9b6897e78
EditorManager: Add OpenEditorFlags to openEditorWithContents
...
This requires moving the activateEditor call into openEditorWithContents.
Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.
Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-03-07 15:56:43 +01:00
Eike Ziller
355f104d0e
BaseTextEditor: Remove some unnecessary indirections through widget
...
Change-Id: I4f71448d6788a4e553b1495b72263a004e65d8c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-01-14 09:05:06 +01:00
hjk
4d96fa7aba
Core: Merge Find and Locator into Core plugin
...
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-01-14 07:43:00 +01:00
Eike Ziller
236ea9efb9
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
share/qtcreator/debugger/dumper.cpp
share/qtcreator/debugger/dumper_p.h
share/qtcreator/debugger/test/main.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.h
src/plugins/debugger/lldblib/guest/main.cpp
src/plugins/debugger/lldblib/ipcengineguest.cpp
src/plugins/debugger/lldblib/ipcengineguest.h
src/plugins/debugger/lldblib/ipcenginehost.cpp
src/plugins/debugger/lldblib/ipcenginehost.h
src/plugins/debugger/lldblib/lldbenginehost.cpp
src/plugins/debugger/lldblib/lldboptionspage.cpp
src/plugins/qbsprojectmanager/qbsstep.cpp
src/plugins/qbsprojectmanager/qbsstep.h
src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
src/plugins/qnx/blackberrycheckdevmodestep.cpp
src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863
Incremented year in copyright info
...
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2014-01-08 08:29:47 +01:00
Eike Ziller
0279661122
VCS: Remove unnecessary indirection
...
Change-Id: I73d70da7e6cc6006da92c05bf0b15da6b8bbf5bf
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-12-19 10:37:55 +01:00
Eike Ziller
072d551c73
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
2013-12-05 11:58:42 +01:00
Orgad Shaneh
0a71091260
Limit cdUp to root
...
Task-number: QTCREATORBUG-10860
Change-Id: I22550b4415e07cac0d78f36595dc7ee781a837c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-12-03 14:42:07 +01:00
Tobias Hunger
7f13b8d3f0
SVN: Remove dead static function
...
Change-Id: I5a3b47e3ca1372c1875ce79d20be60d388145e2f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-11-15 10:58:50 +01:00
jkobus
0f4808a629
Use VcsBaseClient::diff instead of svn's one
...
The first step in cleaning a mess in VCS
Change-Id: I06ee1d9952cc91dc8f599f906d221850ffb0835b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com >
2013-10-16 08:34:15 +02:00
Orgad Shaneh
fdb6ef90fc
VCS: Do not try to add files that are already tracked
...
Task-number: QTCREATORBUG-2455
Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com >
Reviewed-by: Cristian Tibirna <tibirna@kde.org >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-10-11 12:43:25 +02:00
Orgad Shaneh
2da85dc686
VCS: Rename diffBaseDirectory -> workingDirectory
...
Can have other usages than diff
Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-10-10 18:59:50 +02:00
Orgad Shaneh
7b08d993bf
VCS: Pass workingDirectory for annotate
...
Required for supporting renames on annotate.
The renamed file (and possibly its parent directory) doesn't exist
anymore, so it shouldn't be passed as a working directory.
Change-Id: I809e8df17c1dc5199e533b525244a668eccbcd5f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-10-10 18:59:43 +02:00
jkobus
f54b935a61
Use book style capitalization for button labels
...
Change-Id: I9d74792f59a1209a3fbbd4fade39eee04d5ce5f4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
2013-10-10 10:45:28 +02:00
jkobus
a34111e1f0
Fix the condition to work with v 2.0 too
...
Change-Id: I93e929627bd057f5eaec26b3cf8b7c2c55c54363
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-09-26 13:22:50 +02:00