Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Windows, OS X] Switch to Qt 5.6.2 for 2.3 client #3449

Closed
guruz opened this issue Jul 13, 2015 · 32 comments
Closed

[Windows, OS X] Switch to Qt 5.6.2 for 2.3 client #3449

guruz opened this issue Jul 13, 2015 · 32 comments
Assignees
Labels
Enhancement ReadyToTest QA, please validate the fix/enhancement sev1-critical
Milestone

Comments

@guruz
Copy link
Contributor

guruz commented Jul 13, 2015

Right now we're based on 5.4.0+patches

https://github.com/qtproject/qtbase/blob/dev/dist/changes-5.4.1 (incomplete usually)
https://github.com/qtproject/qtbase/blob/dev/dist/changes-5.4.2 (incomplete usually)
https://github.com/qtproject/qtbase/blob/dev/dist/changes-5.5.0 (incomplete usually)
https://wiki.qt.io/New_Features_in_Qt_5.5

@guruz guruz added this to the 2.0 - Multi-account milestone Jul 13, 2015
@dragotin
Copy link
Contributor

I'd vote for staying with the current build that we had for 1.8.4 (5.4.0+patches) for 2.0.0 and go to hopefully 5.5.1 wtih the next bugfix release, ie. oCC 2.0.1. One moving target less.

@hefee
Copy link
Contributor

hefee commented Jul 21, 2015

for downstream it would be nice to to nail to newest qt version and don't bump the minimum version for no reason.

And changing the minimum version within bugfix releases is really not a good thing, cause normally bugfix releases should be a minimal changeset and therefore the dependency shouldn't changed.

For sure you can ship a new qt version within obs at any time - i'm just talking about the CMakefile.txt

@danimo
Copy link
Contributor

danimo commented Jul 29, 2015

There is no time for a 5.5 switch in the 2.0 timeframe. @hefee I don't think we'll soon drop support for older Qt versions, but e.g. 5.5. solves the systray issue. But that's a different conversation, since we can't have 5.5. everywhere in the forseeable future.

@danimo danimo closed this as completed Jul 29, 2015
@guruz
Copy link
Contributor Author

guruz commented Jul 29, 2015

-> 2.1 then

@guruz guruz reopened this Jul 29, 2015
@guruz guruz changed the title Decide if we switch to Qt 5.5 (+patches) for 2.0 client Decide if we switch to Qt 5.5 (+patches) for 2.1 client Jul 29, 2015
@guruz guruz modified the milestones: 2.1-next, 2.0 - Multi-account Jul 29, 2015
@guruz
Copy link
Contributor Author

guruz commented Sep 25, 2015

5.5.1 is about-to-be-released..

@ogoffart
Copy link
Contributor

5.5.1 was released

@guruz
Copy link
Contributor Author

guruz commented Nov 3, 2015

5.6 (unreleased) has some network fixes, analyzing those now and then maybe we stay a bit on our patched 5.4 plus those patches..

@scolebrook
Copy link
Contributor

Is the patched version of qt you use for official builds of ownCloud available anywhere? Or are the mentioned patches in the client repo and get applied during the build process?

I'd prefer to make sure that our build is as close as possible to being the same as yours (apart from branding of course).

@guruz guruz modified the milestones: 2.2-next, 2.1-next Nov 4, 2015
@guruz guruz changed the title Decide if we switch to Qt 5.5 (+patches) for 2.1 client Decide if we switch to Qt 5.6 (+patches?) for 2.2 client Nov 4, 2015
@ogoffart
Copy link
Contributor

ogoffart commented Nov 4, 2015

@scolebrook We use the Qt build on OBS. All the patches are already upstreamed.
https://build.opensuse.org/package/show/isv:ownCloud:toolchains:mingw:win32:stable/mingw32-libqt5-qtbase

@guruz
Copy link
Contributor Author

guruz commented Nov 4, 2015

@scolebrook With ownBrander you automatically get the correct Qt https://doc.owncloud.org/server/8.1/admin_manual/enterprise_clients/creating_branded_apps.html

@scolebrook
Copy link
Contributor

@ogoffart So the patches discussed relate to win only? Stock qt for mac builds is fine?

@guruz We evaluated ownbrander back when it was first released. It didn't do a number of key things we needed and we had a conference call with @bboule, @gig13 and @MTRichards about it IRC. That was a while ago and I should probably re-evaluate as I believe there have been some improvements.

@guruz
Copy link
Contributor Author

guruz commented Nov 5, 2015

@danimo @dschmidt @dragotin FYI 0070835

@guruz
Copy link
Contributor Author

guruz commented Nov 5, 2015

@scolebrook We use the same Qt-patches-on-top for OS X and Windows builds

@dschmidt
Copy link
Member

dschmidt commented Nov 5, 2015

@guruz interesting. Thanks!

@dschmidt
Copy link
Member

dschmidt commented Nov 5, 2015

Any other thoughts on Qt 5.6? Wondering if it's worth trying to build it soon...

@guruz
Copy link
Contributor Author

guruz commented Nov 5, 2015

It looks like I need also

diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py
index 60ff4b9..3a39d82 100755
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -38,8 +38,10 @@ QT_PLUGINS = [
     'imageformats/libqgif.dylib',
     'imageformats/libqico.dylib',
     'imageformats/libqjpeg.dylib',
     'imageformats/libqsvg.dylib',
     'imageformats/libqmng.dylib',
+    'bearer/libqcorewlanbearer.dylib',
+    'bearer/libqgenericbearer.dylib'
 ]

 QT_PLUGINS_SEARCH_PATH=[

else I get "Network access is disabled". Although this is odd, I thought if the bearer plugins are not loaded it would just allow me to use the network no matter what.. (since that is what happened when using Qt 5.4.. or maybe my 5.4 was compiled without bearer management?)

FYI @lpotter

guruz added a commit that referenced this issue Nov 5, 2015
@guruz guruz assigned dragotin and unassigned danimo Oct 6, 2016
@guruz guruz changed the title Switch to Qt 5.6 (+patches) for 2.2 client Switch to Qt 5.6 (+patches) for 2.3 client Oct 6, 2016
@guruz guruz added this to the 2.3.0 milestone Oct 6, 2016
@guruz
Copy link
Contributor Author

guruz commented Oct 14, 2016

@guruz
Copy link
Contributor Author

guruz commented Nov 30, 2016

@jturcotte yesterday volunteered to look at the macbuilder/lexmacbuilder work to be done including jenkins integrations and making sure nothing break :)

I'll try to pick up the Windows part and switch from 5.6.1 to 5.6.2 (will ping @dragotin @jnweiger if i need help)

@guruz guruz changed the title Switch to Qt 5.6 (+patches) for 2.3 client [Windows, OS X] Switch to Qt 5.6 (+patches) for 2.3 client Dec 1, 2016
@guruz guruz changed the title [Windows, OS X] Switch to Qt 5.6 (+patches) for 2.3 client [Windows, OS X] Switch to Qt 5.6.2 (+patches) for 2.3 client Dec 5, 2016
jturcotte added a commit that referenced this issue Dec 7, 2016
Also get rid of the list of different version. We always only support one Qt version
for macOS and Windows, and the list of patches will be based on that supported
version.
guruz pushed a commit that referenced this issue Dec 7, 2016
Also get rid of the list of different version. We always only support one Qt version
for macOS and Windows, and the list of patches will be based on that supported
version.
@guruz
Copy link
Contributor Author

guruz commented Jan 5, 2017

We have a Windows build! Thanks a lot @dragotin and @dschmidt

https://rotor.int.owncloud.com/view/ownCloud-client/job/ownCloud-client-win32/6619/
@SamuAlfageme Can you give this a smoke test? It should mention

Docker image: guruz/docker-owncloud-client-win32 from docker build https://github.com/guruz/docker-ownCloud-client-win32.git#2.3

client branch: win_562 (would need to be merged when changing Jenkins)

@jnweiger Do you want to tag this as real docker-owncloud-client-win32 ? You need to adapt the Jenkins configuration to check if it will really take the tagged docker-owncloud-client-win32 then for 2.3
The goal would be to have the Windows nightlies build with 5.6.2

@dschmidt will work on improving the currently a bit hacky 2.3 OBS repo. Possibly even considering #2140 ?

(I'm gone until 12th this month)

@jnweiger jnweiger mentioned this issue Jan 17, 2017
3 tasks
@guruz guruz added the ReadyToTest QA, please validate the fix/enhancement label Jan 17, 2017
@guruz guruz changed the title [Windows, OS X] Switch to Qt 5.6.2 (+patches) for 2.3 client [Windows, OS X] Switch to Qt 5.6.2 for 2.3 client Jan 17, 2017
@guruz
Copy link
Contributor Author

guruz commented Jan 17, 2017

macOS

  • 10.11.5 the 2.3 nightly is using Qt 5.6.2 and works

Windows

  • Windows 10 the 2.3 nightly is using Qt 5.6.2 and works

Maybe @SamuAlfageme has input on older Windows like Windows 7?

@SamuAlfageme
Copy link
Contributor

@guruz I have been actually using the build from the new cross-compilation image for over a week now in all my tests in Win(7), so far, so good.

Sometime this week, I would move to carry a full functionality/regression test of these builds.

@dschmidt
Copy link
Member

Woohoo, that's good news that we have no obvious regressions :)
(We did a big jump in compiler versions e.g.)

@guruz
Copy link
Contributor Author

guruz commented Jan 25, 2017

Closing this as we implicitely test this :)

@guruz guruz closed this as completed Jan 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement ReadyToTest QA, please validate the fix/enhancement sev1-critical
Projects
None yet
Development

No branches or pull requests

10 participants