KUbuntu 14.04 support restored #1298
Conversation
…xtension. (Implements feature request sqlitebrowser#659)
…ser standards - Add "history" when closing editor window, but reopen before closing preferences - Revert some changes done by QtCreator
- [CHG] Always add "All files (*)" to filters - [FIX] Removed unused include
|
Haven't looked through the entire code (others on the team would need to review this), but something jumped out at me. In But in Whereas in various other files the equality check includes 5.4.0. eg '>= Also, there's some inconsistency with the spacing. eg in the first example above it's |
src/MainWindow.cpp
Outdated
| @@ -82,8 +84,8 @@ void MainWindow::init() | |||
| tabifyDockWidget(ui->dockLog, ui->dockSchema); | |||
| tabifyDockWidget(ui->dockLog, ui->dockRemote); | |||
|
|
|||
| #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) //Needed only on macOS | |||
There was a problem hiding this comment.
This seems to have dropped the check for OSX? eg it looks like this will be used for all OS's >= Qt 5.4.0.
Am I reading that wrong?
[CHG] Reverted macOS check on Mainwindow for OpenGL context creation
|
Yep, you're right. Thanks 😄 |
|
The Travis CI run for this failed, but looking at the log it seems like a failure with the Travis CI infrastructure itself rather than anything with the latest commit. eg Ignore it. 😄 |
|
@justinclift it seems they are facing some issue with the servers and RabbitMQ. The last commit build has been canceled. I think they are restoring everything so all the pending jobs have been canceled. |
| } | ||
| contains(QT_VERSION, ^5\\..*\\..*) { | ||
| QMAKE_CXXFLAGS += -std=c++11 | ||
| } |
There was a problem hiding this comment.
This should be simplified to just the following because we don't support Qt 4.x anyway.
QMAKE_CXXFLAGS += -std=c++11
| QMAKE_CXXFLAGS += -std=c++0x | ||
| } | ||
| contains(QT_VERSION, ^5\\..*\\..*) { | ||
| QMAKE_CXXFLAGS += -std=c++11 |
|
As these were only minor things I'm going to merge this anyway and tweak it afterwards 😉 @GortiZ6 Feel free to open new pull requests if we ever introduce code which breaks KUbuntu 14.04 support again 😃 |
|
Hi @MKleusberg, sorry for the late answer. I fixed the two *.pro files and I had to add a check on Qt 5.4.0 for the bug report function so I don't know if you want it or not (KUbuntu 14.04 comes with Qt 5.2.1 which don't have the QSysInfo you're using there) |
|
No worries, @GortiZ6 😄 I have fixed the two .pro files in the meantime, so no need to fix that again. But the Qt 5.4.0 check for the bug report function would be very welcomed! That definitely makes sense. Because it's not a major feature we could just not include any system information when using Qt <5.4. If you have the time, feel free to open a new PR for that 😄 And thanks again for this one! |
I don't know if this might be of any interest, but I needed to compile sqlitebrowser for KUbuntu 14.04 so I fixed the support for it.
It's not 100% the same behavior since some Qt functions are missed (mostly the location for the application data has been moved from QStandardPaths::AppDataLocation to QStandardPaths::GenericDataLocation due to the first been not present in Qt 5.2.1).
The rest is mostly back-porting small Qt functions into the code and explicitly enabling C++11 support.