Hi
Png configure detection is adding 3rd party directory to compile even if
told -system-png.
Attached a patch to fix it.
Should i submit to 5.7 branch on gerrit ?
On Wed, Nov 16, 2016 at 9:58 AM, Erik Verbruggen <erik.verbrug...@qt.io>
wrote:
> For my "use case" (the qml profiler in creator) it's done. But I don't
> know if more patches have to go in. Maybe Morton can enlighten us?
>
> -- Erik
> ------------------------------
> *From:* Development <development-bounces+erik.verbruggen=qt.io@qt-project.
> org> on behalf of Dmitry Volosnykh <dmitry.volosn...@gmail.com>
> *Sent:* 16 November 2016 07:29:25
> *To:* Jani Heikkinen; development@qt-project.org
> *Subject:* Re: [Development] Qt 5.7.1 packages available
>
> Should QTBUG-37095 be removed from Known Issues since it is closed as Done?
>
> On Wed, Nov 16, 2016 at 8:08 AM Jani Heikkinen <jani.heikki...@qt.io>
> wrote:
>
>> Hi all,
>>
>> We have finally Qt 5.7.1 packages:
>>
>> Linux: http://download.qt.io/snapshots/qt/5.7/5.7.1/570/
>> Windows: http://download.qt.io/snapshots/qt/5.7/5.7.1/650/
>> Mac: http://download.qt.io/snapshots/qt/5.7/5.7.1/598/
>> Src:http://download.qt.io/snapshots/qt/5.7/5.7.1/latest_src/
>>
>> According to RTA smoke testing packages seems to be OK so please test the
>> packages as soon as possible. All known blockers should be fixed, please
>> verify fixes for open ones ( https://bugreports.qt.io/
>> issues/?filter=17833 ). We will release these packages as Qt 5.7.1 later
>> (maybe already this Thu) if nothing really serious found during testing.
>>
>> Please update the known issues page when needed:
>> https://wiki.qt.io/Qt_5.7.1_Known_Issues
>>
>> Known issues in the packages: https://bugreports.qt.io/
>> issues/?filter=18129
>>
>> br,
>> Jani
>>
>>
>>
>>
>>
>> _______________________________________________
>> Development mailing list
>> Development@qt-project.org
>> http://lists.qt-project.org/mailman/listinfo/development
>>
>
> _______________________________________________
> Development mailing list
> Development@qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>
>
--- qtbase-opensource-src-5.7.1/src/src.pro.orig 2016-10-05 19:33:26.000000000 +0200
+++ qtbase-opensource-src-5.7.1/src/src.pro 2016-11-09 12:31:35.781935319 +0100
@@ -135,8 +135,10 @@
contains(QT_CONFIG, zlib)|cross_compile {
SUBDIRS += src_qtzlib
contains(QT_CONFIG, zlib) {
- src_3rdparty_libpng.depends += src_corelib
- src_3rdparty_freetype.depends += src_corelib
+ !contains(QT_CONFIG, system-png) {
+ src_3rdparty_libpng.depends += src_corelib
+ src_3rdparty_freetype.depends += src_corelib
+ }
}
}
SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc
@@ -167,10 +169,13 @@
SUBDIRS += src_angle
src_gui.depends += src_angle
}
- contains(QT_CONFIG, png) {
- SUBDIRS += src_3rdparty_libpng
- src_3rdparty_freetype.depends += src_3rdparty_libpng
- src_gui.depends += src_3rdparty_libpng
+
+ !contains(QT_CONFIG, system-png) {
+ contains(QT_CONFIG, png) {
+ SUBDIRS += src_3rdparty_libpng
+ src_3rdparty_freetype.depends += src_3rdparty_libpng
+ src_gui.depends += src_3rdparty_libpng
+ }
}
contains(QT_CONFIG, freetype) {
SUBDIRS += src_3rdparty_freetype
_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
