aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Reflect current URL in example commentJason Erb2017-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Update submodules on '5.6' in qt5Liang Qi2017-03-163-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Remove init-repository assumption of repo url “…/qt/<repo>”Jason Erb2017-03-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-59355 Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | Provision: Storage icu version to versions.txtHeikki Halmet2017-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ~/versions.txt will be used to storage sw version information Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Update submodules on '5.6' in qt5Liang Qi2017-02-254-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update qtserialbus manuallyLiang Qi2017-04-011-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic4e1200a5d75e0c7b33fcb43efb27706260e3202 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-0116-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I64a699afde6c7444abfad5d0cac19f2d1d332f7f Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.9' in qt5Liang Qi2017-03-3014-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7dfea76bca9df8ab4db1be65068ffa46b414ad3d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-04-083-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie2ddd1a461354278d4570e0dc98dcf4d339183d3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-04-084-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id5c90ac07c171d06f5d4bc06021cbfedad77a5b3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-04-079-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I82c6dff79747702f65c17b094f2decad3f471cc6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-04-022-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If1a1dc0efcd16aa0887622800394d45d11f120cb Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-03-319-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic47ce220597dda941335d6e0ea5dab224c900af3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-2810-232/+28
|\| | | | | | | | | | | | | | | Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
| * | | Update submodules on '5.9' in qt5Liang Qi2017-03-2816-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iefd15fd52d2300981820cb1b067f512228100503 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.9' in qt5Liang Qi2017-03-198-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id9f9836551a35fba5ccd12be449f9c4a92acf486 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.9' in qt5Liang Qi2017-03-1824-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I210324952a0126cd656344eebee2dbd6a32f6dc1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Install g++-multilib on Ubuntu 16.04 platformsAllan Sandfeld Jensen2017-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to cross-build to 32bit x86 which WebEngine needs for Boot2Qt ARM builds. Task-number: QTBUG-59504 Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Remove command line tools from macOS 10.11 and 10.12Tony Sarajärvi2017-03-154-222/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt should not require command line tools to be installed. When they are installed, we can accidentally rely on on the tools instead of sysroot. Task-number: QTBUG-58325 Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Recommend qtquickcontrols2 for qtlocationPaolo Angelelli2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MapViewer example now uses qtquickcontrols2 sliders. This patch adds the related dependency Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-03-1333-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6e972d67243340551b0cae64619428a8f601f4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Fix network test server setupSimon Hausmann2017-03-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the correct IP address for the network test server that all the other machines are using as well. Change-Id: I1ffe4b6f5851bcb06dc2d39265979b799715ec3f Task-number: QTBUG-59241 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | Update submodules on '5.9' in qt5Liang Qi2017-03-1012-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id75b75b5dff01db70f87c0f72648bd158e6465dd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Add ForceDebugInfo to MSVC platformsJoerg Bornemann2017-03-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create release debug information for MSVC configurations for which we build packages. Also, for hard-to-reproduce autotest crashes in the CI enabling ForceDebugInfo is crucial to get a meaningful backtrace. Task-number: QTBUG-3934 Change-Id: Ie4ea7b9c6aa251a12796621817d8e3411bbed81d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update submodules on '5.9' in qt5Liang Qi2017-03-0714-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idad0e50dd673356a7ed27d7c7c978ba10229b71a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Liang Qi2017-03-236-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I5df7b6ba38a1e641aa8d154d8184a12cbd2f85bd Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Liang Qi2017-03-229-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9ef55bdca766e92281b92011b63ba9781f4db53f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on 'dev' in qt5Liang Qi2017-03-168-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie422699479ce2da8c94cde3987a4685348aa7a21 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-0756-185/+2382
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also integrated latest dev branch of qtremoteobjects and qtwebengine. Conflicts: .gitmodules qtremoteobjects qtwebengine Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
| * | | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-0412-3/+474
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
| | * | Provisioning: Upgrade conan version from 0.16.0 to 0.20.2Akseli Salovaara2017-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conan provisioning fails on private Coin instance due to error message Could not find a version that satisfies the requirement conan==0.16.0 (from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1, 0.20.2) No matching distribution found for conan==0.16.0 Upgrading to 0.16.1 resulted warning "Your conan's client version is deprecated for the current remote (v0.20.2). Upgrade conan client." and provisioning failed with "ERROR: All remotes failed" After upgrade to 0.20.2 conan provisioning script is working again. Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-02-273-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Icdce897429db6ec02938807bc2add8ae8d9a1ccc Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Make top-level configure script more portableSvintsov Dmitry2017-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hard-coded path to pwd; there is no need to have it, and for example NixOS doesn't actually have it at this location, leading to such an error: ./configure: line 36: /bin/pwd: No such file or directory /qtbase/configure not found. Did you forget to run "init-repository"? Change-Id: If3372db3390ba5f39c5003d12ff2a466f39ff353 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-02-244-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id5ddefcb8bb28109f75b181e5db41ad98519ffc6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | declare optional dependency of qtwebengine on qttoolsOswald Buddenhagen2017-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | starting with 5.7, it optionally comes with a qt designer plugin. Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-02-236-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I81b3b50b87402c49a306d381c2d107fc6d4d91da Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-02-197-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2a905ff8300b2f64537446ee763202eeed216c6e Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.8Liang Qi2017-02-179-0/+471
| | |\| | | | | | | | | | | | | Change-Id: I0203dea8e441e58400d6c44697588a44b97a522b
| | | * Update submodules on '5.6' in qt5Liang Qi2017-02-119-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Provisioning: Update opengl32.dll x86 on Windows 10 x64Akseli Salovaara2017-02-101-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL32 update is needed for autotests to pass. At least tst_qglbuffer vertexBuffer will fail without an update. This update is already in place on Windows x86 and x64 CI hosts but applied only to System32 -folders. Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * Provisioning: Install postgresql x86 and x64 libraries to Windows 10Akseli Salovaara2017-02-101-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64Akseli Salovaara2017-02-101-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64Akseli Salovaara2017-02-101-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * Provisioning: Visual Studio 2015 with update 3Heikki Halmet2017-02-073-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Common install script for Visual Studio installation and updates. Latest Visual Studio 2015 update is required for releases Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Upgrade CMake to 3.6.2Konstantin Tokarev2017-02-073-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on Windows 10 machines. Task-number: QTQAINFRA-996 Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 77eeee64a43c5c448321b8f5ac7b64c872e14489)
| | | * Upgrade CMake to 3.6.2 on Windows 7 builderKonstantin Tokarev2017-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-996 Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit daa865312104e7d5d073b0a63e0f50c8a04b9697)
| | | * Upgrade CMake to 3.6.2 on Windows 8Simo Fält2017-02-072-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pyside requires CMake 3.0 or higher Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Update qtwebengine manually againLiang Qi2017-02-171-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6fabfa3a4ce0b0fbcb1da2e15bdf5f8f6ac6e643 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update qtwebengine manuallyLiang Qi2017-02-161-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I86dc97895dbbbff1a14e90d0a7c2ae359ce25891 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-02-156-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idb3b5cdd408d20582f10372a0e42e6f63e7a94bc Reviewed-by: Liang Qi <liang.qi@qt.io>