diff --git a/fuel.pro b/fuel.pro index f1ca1db..4cdc75a 100644 --- a/fuel.pro +++ b/fuel.pro @@ -2,10 +2,11 @@ # Fuel #------------------------------------------------- -QT += core gui webkit +QT = core gui webkit contains(QT_VERSION, ^5\\..*) { QT += widgets webkitwidgets + QT -= quick multimediawidgets opengl printsupport qml multimedia positioning sensors } TARGET = Fuel diff --git a/manifest b/manifest index 2e7e729..d598a43 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merged\swith\strunk\nPorted\sthe\sicon\scache -D 2015-05-03T19:27:50.028 +C Fixed\swindows\sbuild\n +D 2015-05-05T12:41:04.779 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -15,7 +15,7 @@ F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e F doc/Building.txt 17b43fa23da764b5d1b828cc48c5a95e612bbd8f F doc/Changes.txt b03302545e4a6c0b16a30d623a7627f8aef65ef6 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c -F fuel.pro 6199ecb89dd8cc9a1d5357ebcac774edc302ef0d +F fuel.pro d64e2a78105bf9ecbb288a17b2706afcc4c12514 F intl/convert.bat 4222ae403418381452b843929d15259ea9850ab1 x F intl/convert.sh 2ca2179ff53e727f241925b75e19182607883c45 x F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741 @@ -200,7 +200,7 @@ F src/Fossil.cpp ca7ad24622e1fc1a03c92d7ae9b51afc17f7c09c F src/Fossil.h d65a7461d213bcc30f08724d3306c6ee00843217 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp e56d3fe486a388a27f39648de7a58fab8be2824e +F src/MainWindow.cpp 6a50f409c7cb2aa5389183854a4dbe8de3c9cfef F src/MainWindow.h 2b84fe52f8184364d63a7c9518500017b866e8ea F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 @@ -220,7 +220,7 @@ F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui 9dd0f9ef3f486413c9af912ac557c0e7bf9c6f50 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -P 2744a0db324c05cb0f4e2e73128d8c3837d66479 964b28f34fae482959ce8a96cbc6106f8702fb33 -R 5246702db3f74ca03143a4c68bf370e8 +P 713625d58306a081885455e8f3869723fe649fdd +R 3f2a9c7e59766c3afa452fa6b694203b U kostas -Z 59727ab2a076e48750a62615838a345e +Z a45941c84960e7cd1bcf66f0580b2931 diff --git a/manifest.uuid b/manifest.uuid index 3dc7187..8af0d99 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -713625d58306a081885455e8f3869723fe649fdd \ No newline at end of file +9eea1bac1b8780266c9eac0e31d9d9246854e6ac \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 80c99cf..3de5ad6 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -2015,7 +2015,7 @@ void MainWindow::on_fileTableView_customContextMenuRequested(const QPoint &pos) if(fnames.size()==1) { - QString fname = getCurrentWorkspace() + PATH_SEP + fnames[0]; + QString fname = getCurrentWorkspace() + PATH_SEPARATOR + fnames[0]; fname = QDir::toNativeSeparators(fname); if(ShowExplorerMenu((HWND)winId(), fname, gpos)) refresh();