Skip to content
GitLab
Select Git revision
  1. 07 Nov, 2014 - 1 commit
  3. 31 Oct, 2014 - 1 commit
    • Thiago Macieira's avatar
      Don't use qDebug and qWarning for formatted output · be9c969b
      Thiago Macieira authored 
      
They are not meant to be used like that. If you want formatted output to
the console, use stdio.h functions or std::cout. Otherwise, you get
something like:

 $ qmlscene -h
 [233103.196] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?): Usage: qmlscene [options] <filename>
 [233103.197] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?):
 [233103.197] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?):  Options:
 [233103.198] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?):   --maximized ............................... Run maximized
 [...]

I've replaced all qDebug with puts/printf and most qWarning with fprintf
to stderr. In my opinion, some of the qWarnings aren't errors, so I
replaced those with puts/printf too.

Change-Id: I3e493950bc4a588059fec6c7441b010c2780dffd
Reviewed-by: default avatarSimon Hausmann <simon.hausmann@digia.com>
      be9c969b
  5. 28 Oct, 2014 - 1 commit
    • Shawn Rutledge's avatar
      Revert: use the new form of QTranslator::load() for more flexibility · 05d8ffb4
      Shawn Rutledge authored 
      This reverts commit 427646b8

.
It seems that it should have been more correct, but we are still not
shipping English translations, and static QString find_translation()
in qtranslator.cpp will return any language which is in
QLocale::uiLanguages() for which the translation file is found.
That is a long list on OSX.

Reverting the patch means find_translation() is not called in
such cases.  This change can be re-done whenever we are more sure
that the attempt to find a translation will succeed in finding a
sensible one, or fall back to not translating, rather than choosing
a language that the user didn't intend.

Task-number: QTBUG-41977
Change-Id: I425946cc71cec96b4f38629eb2b7e80220c5236d
Reviewed-by: default avatarJan Arve Sæther <jan-arve.saether@theqtcompany.com>
      05d8ffb4
  7. 01 Oct, 2014 - 1 commit
    • Shawn Rutledge's avatar
      use the new form of QTranslator::load() for more flexibility · 427646b8
      Shawn Rutledge authored 
      
As the docs explain, the variant of QTranslator::load() taking a
const QLocale& is better because it "uses QLocale::uiLanguages()
and not simply the locale name, which refers to the formatting of
dates and numbers and not necessarily the UI language."  And, using
a default-constructed QLocale permits QLocale::setDefault() to
override the system locale, so for example an application's
main.cpp can do that before constructing a QQmlApplicationEngine.

Task-number: QTBUG-7329
Change-Id: Ia29a4c894087c92b071c0fe484728866f2660fe6
Reviewed-by: default avatarJan Arve Sæther <jan-arve.saether@digia.com>
      427646b8
  9. 04 Sep, 2014 - 1 commit
  11. 25 Aug, 2014 - 1 commit
  13. 05 Aug, 2014 - 1 commit
  15. 02 Jul, 2014 - 1 commit
  17. 04 Apr, 2014 - 1 commit
  19. 29 Mar, 2014 - 1 commit
  21. 13 Mar, 2014 - 1 commit
    • Erik Larsson's avatar
      Fix crash in qml/qmlscene when using dummy-data with imports · f3d8386b
      Erik Larsson authored 
      
When using the tools qml and qmlscene with dummy-data it will crash or
behave wrong, due to the dummy-data component will get the state not
ready, if the dummy-data qml-files does an import of another folder or
a js-file.  By changing the way of loading dummy-data, by letting
QQmlComponent handle the file opening instead of using the setData()
method, qmlscene and qml will be able to handle this type of
dummy-data.

The tool qml also needed to load the dummy data before loading the
regular components, otherwise the dummy-data would not be ready for the
other components to use.

Task-number: QTBUG-32721

Change-Id: Ia1cc2b2626187e23c7d7313be788202d91b12471
Reviewed-by: default avatarAlan Alpert <aalpert@blackberry.com>
      f3d8386b
  23. 08 Sep, 2013 - 1 commit
  25. 04 Jul, 2013 - 1 commit
  27. 04 Jun, 2013 - 1 commit
  29. 23 May, 2013 - 1 commit
  31. 22 May, 2013 - 1 commit
  33. 02 Apr, 2013 - 1 commit
  35. 05 Feb, 2013 - 1 commit
  37. 10 Jan, 2013 - 1 commit
  39. 04 Jan, 2013 - 1 commit
  41. 11 Dec, 2012 - 1 commit
  43. 06 Dec, 2012 - 1 commit
    • Alan Alpert's avatar
      Change qFatal to qWarning · 425260c2
      Alan Alpert authored 
      
While the process should terminate immediately with a non-zero exit code
on component error, it does that in the next line already. The main
difference is dropping the backtrace, which is not useful in this case.

Change-Id: I866ea00e62cb9d1b7c506b9819cd9bb2750ac81f
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
      425260c2
  45. 30 Nov, 2012 - 1 commit
  47. 26 Nov, 2012 - 1 commit
  49. 22 Nov, 2012 - 1 commit
  51. 09 Nov, 2012 - 1 commit
  53. 08 Nov, 2012 - 1 commit
  55. 05 Nov, 2012 - 1 commit
  57. 25 Oct, 2012 - 1 commit
  59. 23 Sep, 2012 - 1 commit
  61. 30 Jul, 2012 - 1 commit
  63. 26 Jul, 2012 - 1 commit
  65. 25 Jul, 2012 - 1 commit
  67. 17 Jul, 2012 - 2 commits
    • Charles Yin's avatar
      Add I18N support to qmlscene · d8fadcbf
      Charles Yin authored 
      
Task-number: QTBUG-22391
Change-Id: Id567d4aabf47ce4790cf33979c4e464ba4f09357
Reviewed-by: default avatarYunqiao Yin <charles.yin@nokia.com>
      d8fadcbf
    • Alan Alpert's avatar
      QQuickCanvas renames · feb996e3
      Alan Alpert authored 
      
QQuickCanvas is now called QQuickWindow
QQuickCanvas::rootItem is now QQuickWindow::contentItem
QQuickItem::canvas is now QQuickItem::window
QQuickItem::ItemChangeData::canvas is also renamed window
QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow
The functions related to the color property have dropped the clear from
their names.

The first three changes have interim compatibility measures in place to
ease the transition.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2
Reviewed-by: default avatarMartin Jones <martin.jones@nokia.com>
      feb996e3
  69. 25 Jun, 2012 - 1 commit
  71. 19 Jun, 2012 - 2 commits
  73. 09 Jun, 2012 - 1 commit
  75. 28 May, 2012 - 1 commit